)]}' { "log": [ { "commit": "568133ebda39f7507759a744fa9cf4d5097bad2f", "tree": "0a5cfe67eabe23bcbd9bb4b60a56e00500496536", "parents": [ "447bd479105c34416dad01c374873c34d8e25cfd" ], "author": { "name": "Pablo Castillo", "email": "CyberCastle@gmail.com", "time": "Tue Aug 10 18:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "mmc: add ricoh e822 pci id\n\nSigned-off-by: Pablo Castillo \u003cCyberCastle@gmail.com\u003e\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nTested-by: Gregg Lebovitz \u003cgregg@lebovitz.net\u003e\nCc: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c4512f79dcb236c8dc2afae176a0dc520096f0bc", "tree": "4aced8cb26bae4256e538c6a35679d31c60d7dc2", "parents": [ "9bea3c850dbff2296892298614388bdc71ad2170" ], "author": { "name": "Jerry Huang", "email": "Chang-Ming.Huang@freescale.com", "time": "Tue Aug 10 18:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci: add auto CMD12 support for eSDHC driver\n\nAdd auto CMD12 command support for eSDHC driver. This is needed by P4080\nand P1022 for block read/write. Manual asynchronous CMD12 abort operation\ncauses protocol violations on these silicons.\n\nSigned-off-by: Jerry Huang \u003cChang-Ming.Huang@freescale.com\u003e\nSigned-off-by: Roy Zang \u003ctie-fei.zang@freescale.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Kumar Gala \u003cgalak@gate.crashing.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9bea3c850dbff2296892298614388bdc71ad2170", "tree": "bc5050601ec6349441ef3d35cbda2775808eee20", "parents": [ "17866e14f3a4f219e94f1374ece7226479418ff8" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci: add regulator support\n\nThis patch adds support for regulator API to sdhci core driver.\nRegulators can be used to disable power in suspended state to reduce\ndissipated energy.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "17866e14f3a4f219e94f1374ece7226479418ff8", "tree": "4e1a618f9dbcdc982bac4289eec30a87c764c33c", "parents": [ "a1d5646005af1247d6ae78434bb4db15b07a07b2" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add support for new card detection methods\n\nOn some Samsung SoCs not all SDHCI controllers have card detect (CD) line.\n For some embedded designs it is not even needed, because ususally the\ndevice (like SDIO flash memory or wifi controller) is permanently wired to\nthe controller. There are also systems which have a card detect line\nconnected to some of the external interrupt lines or the presence of the\ncard depends on some other actions (like enabling a power regulator).\n\nThis patch adds support for all these cases. The following card detection\nmethods are possible:\n\n1. internal sdhci host card detect line\n2. external event\n3. external gpio interrupt\n4. no card detect line, controller will poll for the card\n5. no card detect line, card is permanently wired to the controller\n(once detected host won\u0027t poll it any more)\n\nBy default, all existing code would use method #1, what is compatible with\nthe previous version of the driver.\n\nIn case of external event, two callbacks must be provided in platdata:\next_cd_init and ext_cd_cleanup. Both of them get a callback to a function\nthat notifies the s3c-sdhci host contoller as their argument. That\ncallback function should be called from the even dispatcher to let host\nnotice the card insertion/removal.\n\nIn case of external gpio interrupt, a gpio pin number must be provided in\nplatdata (ext_cd_gpio parameter), as well as the information about the\npolarity of that gpio pin (ext_cd_gpio_invert). By default\n(ext_cd_gpio_invert \u003d\u003d 0) gpio value 0 means \u0027card has been removed\u0027, but\nthis can be changed to \u0027card has been removed\u0027 when ext_cd_gpio_invert \u003d\u003d\n1.\n\nThis patch adds all required changes to sdhci-s3c driver.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1d5646005af1247d6ae78434bb4db15b07a07b2", "tree": "7df620c8af7941df3f46ccfce705bc4caff48011", "parents": [ "ce5f036bbbfc6c21d7b55b8fdaa2e2bd56392d94" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: enable SDHCI_QUIRK_NO_HISPD_BIT quirk\n\nThis patch enables SDHCI_QUIRK_NO_HISPD_BIT on Samsung SDHCI driver. This\nsolves detection problems with some external SD cards. This change has\nbeen tested on S5PC100 and S5PC110. It has no inpact on driver speed.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ce5f036bbbfc6c21d7b55b8fdaa2e2bd56392d94", "tree": "9567c61e6df52664b86c0d0da9f0cdb5a52de4b6", "parents": [ "3fe42e077f65351503f5004031549db330bb105e" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add support for the non standard minimal clock value\n\nS3C SDHCI host controller can change the source for generating mmc clock.\nBy default host bus clock is used, what causes some problems on machines\nwith 133MHz bus, because the SDHCI divider cannot be as high get proper\nclock value for identification mode. This is not a problem for the\ncontroller, because it can generate lower frequencies from other clock\nsources. This patch changes sdhci driver to use get_min_clock() call if\nit has been provided.\n\nThis fixes the flood of the following warnings on Samsung S5PV210 SoCs:\nmmc0: Minimum clock frequency too high for identification mode\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3fe42e077f65351503f5004031549db330bb105e", "tree": "f05f0090d72573d9092d2f784a707819eb760fce", "parents": [ "f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab" ], "author": { "name": "Hyuk Lee", "email": "hyuk1.lee@samsung.com", "time": "Tue Aug 10 18:01:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK quirk\n\nOn Samsung\u0027s SDMMC hosts the timeout clock is derivied from the SD Clock\nwhich is set dynamically. So checked SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK\nquirk and removed \u0027sdhci_s3c_get_timeout_clk\u0027 callback which doesn\u0027t need\nany more.\n\nSigned-off-by: Hyuk Lee \u003chyuk1.lee@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab", "tree": "9d56c5f9434e999ab361ad50499b0987211f4c38", "parents": [ "762333e344144283a9da97a34b5dded51ff61b27" ], "author": { "name": "Venkatraman S", "email": "svenkatr@ti.com", "time": "Tue Aug 10 18:01:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "omap hsmmc: fix processing of all dma interrupts as block completion\n\nIf other informative interrupts are enabled for the DMA channel used by\nhsmmc, those are incorrectly treated as block completion. This patch lets\nonly the block completion interrupt to be processed.\n\nSigned-off-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "762333e344144283a9da97a34b5dded51ff61b27", "tree": "8bc2af8a99e66cbbcba359f7bd8ca76cd332ec34", "parents": [ "ed199f7e7346ba508f803180ecc6830e92558a1e" ], "author": { "name": "Christian Dietrich", "email": "qy03fugy@stud.informatik.uni-erlangen.de", "time": "Tue Aug 10 18:01:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "drivers/mmc/host/msm-sdcc: remove dead config options\n\nCONFIG_MMC_MSM7X00A_RESUME_IN_WQ and CONFIG_MMC_EMBEDDED_SDIO don\u0027t exist\nin Kconfig and is never defined anywhere else, therefore removing all\nreferences for it from the source code.\n\nSigned-off-by: Christian Dietrich \u003cqy03fugy@stud.informatik.uni-erlangen.de\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4816858cce279b5e8d1eab0b4832d89d8f2ca58c", "tree": "81da0dc2193db08910ba5d1c7a55e03dcd7274a9", "parents": [ "6f51be3d37dff73cf8db771df4169f4c2f1cbf66" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Tue Aug 10 18:01:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "omap_hsmmc: add init_card pass-through callback\n\nThis will allow us to set up special cards in machine drivers just after\nthey are detected by MMC core.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Bob Copeland \u003cme@bobcopeland.com\u003e\nCc: Kalle Valo \u003ckvalo@adurom.com\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Kishore Kadiyala \u003ckishore.kadiyala@ti.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20b1597bcf4a76ccab232fa032f5f9ad30069167", "tree": "37ff80d3df4d7d10a35276080f319bb340e4ea2b", "parents": [ "845e3f4f06f9b1d34f39601cb6b7abfb8f40653c" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: add support for CNS3xxx SoC devices\n\nThere\u0027s nothing special, just SoC-specific ops and quirks.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "845e3f4f06f9b1d34f39601cb6b7abfb8f40653c", "tree": "a8c8340f2210c99fbc2d3cb3f50fcff40274a21f", "parents": [ "515033f97c0b5a1bce13fa93e09704d95b44f376" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: reorganize Makefile entries to support SoC devices\n\nDue to build system limitations, intermediate and final objects can\u0027t have\nthe same names. And as we\u0027re going to start building SoC-specific\nobjects, let\u0027s rename the module to sdhci-platform, into which we\u0027ll link\nsdhci-pltfm and SoC-specifc objects.\n\nThere should be no issue in renaming as the driver uses modalias\nmechanism.\n\nThis is exactly the same approach as in sdhci-of driver.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "515033f97c0b5a1bce13fa93e09704d95b44f376", "tree": "c3cf267cbe660920682f3f996fded61afadd412f", "parents": [ "27151dc9e363c0033d7375863c0d284f8c4b636a" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: switch to module device table matching\n\nSometimes want to place SoC-specific parts alongside with the generic\ndriver, and to do so, we have to switch the driver over to the module\ndevice table matching.\n\nNote that drivers/mmc/host/sdhci-pltfm.h is so far empty, but it\u0027ll hold\nSoC-specific driver data handlers soon.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27151dc9e363c0033d7375863c0d284f8c4b636a", "tree": "401329dc2634b84f427bb4338e9f556912f4ee7a", "parents": [ "fc8a0985c2846292312556cba10b8a4182f55967" ], "author": { "name": "Kishore Kadiyala", "email": "kishore.kadiyala@ti.com", "time": "Tue Aug 10 18:01:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: omap: fix for bus width which improves SD card\u0027s peformance.\n\nThis patch improves low speeds for SD cards.\n\nOMAP-MMC controller\u0027s can support maximum bus width of \u00278\u0027. when bus\nwidth is mentioned as \"8\" in controller data,the SD stack will check\nwhether bus width is \"4\" and if not it will set bus width to \"1\" and there\nby degrading performance. This patch fixes the issue and improves the\nperformance of SD cards.\n\nSigned-off-by: Kishore Kadiyala \u003ckishore.kadiyala@ti.com\u003e\nSigned-off-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nTested-by: Jarkko Nikula \u003cjhnikula@gmail.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c1f5977c6a136acbf525c634c8511e19d0c1f195", "tree": "404ef41ded924ff55fae708933c7fb80c2117328", "parents": [ "ae6d6c92212e94b12ab9365c23fb73acc2c3c2e7" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: don\u0027t assign mmc-\u003ecaps at SDHCI directly\n\nSome host controllers can set mmc-\u003ecaps before sdhci_add_host().\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae6d6c92212e94b12ab9365c23fb73acc2c3c2e7", "tree": "ab0337dcb0528d39c8c34cecb845c22b42e50c51", "parents": [ "cfd1f82f20e0c557a061189f7d8c30d623fbe313" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: 8-bit data transfer width support\n\nSome host controllers such as s5pc110 support the WIDE8 feature.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cfd1f82f20e0c557a061189f7d8c30d623fbe313", "tree": "176c0ebd310c963c3837968d3b0f63c744076a27", "parents": [ "ccc92c23240cdf952ef7cc39ba563910dcbc9cbe" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: remove useless set_clock() check\n\nWhen using QUIRK_NONSTANDARD_CLOCK, it checks the set_clock() function\nwhich is not used actually. So delete it.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ccc92c23240cdf952ef7cc39ba563910dcbc9cbe", "tree": "d656aad9e86fff59c1a5cbece4a5ccb019c35011", "parents": [ "4c2ef25fe0b847d2ae818f74758ddb0be1c27d8e" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Tue Aug 10 18:01:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: make sdhci work with ricoh mmc controller\n\nThe current way of disabling it is not well tested by vendor and has all\nkinds of bugs that show up on resume from ram/disk. A very good example\nis a dead SDHCI controller.\n\nOld way of disabling is still supported by continuing to use\nCONFIG_MMC_RICOH_MMC.\n\nBased on \u0027http://list.drzeus.cx/pipermail/sdhci-devel/2007-December/002085.html\u0027\nTherefore most of the credit for this goes to Andrew de Quincey\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: Andrew de Quincey \u003cadq_dvb@lidskialf.net\u003e\nAcked-by: Philip Langdale \u003cphilipl@overt.org\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "c3d1f1746b966907ba5ad2f75ddca24db8b21147", "tree": "548a25e104d8bdb906030b8d3bf78fbfde0e5817", "parents": [ "66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f", "0d365753d0b7c26043fdfa97790411606fb40112" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)\n MIPS: PowerTV: Separate PowerTV USB support from non-USB code\n MIPS: strip the un-needed sections of vmlinuz\n MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS\n MIPS: Clean up arch/mips/boot/compressed/decompress.c\n MIPS: Clean up arch/mips/boot/compressed/ld.script\n MIPS: Unify the suffix of compressed vmlinux.bin\n MIPS: PowerTV: Add Gaia platform definitions.\n MIPS: BCM47xx: Fix nvram_getenv return value.\n MIPS: Octeon: Allow more than 3.75GB of memory with PCIe\n MIPS: Clean up notify_die() usage.\n MIPS: Remove unused task_struct.trap_no field.\n Documentation: Mention that KProbes is supported on MIPS\n SAMPLES: kprobe_example: Make it print something on MIPS.\n MIPS: kprobe: Add support.\n MIPS: Add instrunction format for BREAK and SYSCALL\n MIPS: kprobes: Define regs_return_value()\n MIPS: Ritually kill stupid printk.\n MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.\n MIPS: Octeon: Support 256 MSI on PCIe\n MIPS: Decode core number for R2 CPUs.\n ...\n" }, { "commit": "61bfbdb856879cff583fe53b2ab6ae907faedee7", "tree": "6c7f58f04ea51e0a944f4bd50be597ee223a10a3", "parents": [ "ba01d6ec04f6d1d983101eb527caa96318fc1017" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Thu Jul 15 20:06:04 2010 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Aug 05 13:26:18 2010 +0100" }, "message": "MMC: Add support for the controller on JZ4740 SoCs.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: linux-mmc@vger.kernel.org\nCc: linux-mips@linux-mips.org\nCc: linux-kernel@vger.kernel.org\nPatchwork: https://patchwork.linux-mips.org/patch/1463/\nPatchwork: https://patchwork.linux-mips.org/patch/1523/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "be82ae0238b0453afcf4a76f0512b7dde34ba500", "tree": "aaa3f5f11fd51fd73365ee1a2164aad9a03de060", "parents": [ "4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0", "7b70c4275f28702b76b273c8534c38f8313812e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits)\n ARM: AMBA: Add pclk support to AMBA bus infrastructure\n ARM: 6278/2: fix regression in RealView after the introduction of pclk\n ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128\n ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY\n ARM: 6246/1: mmci: support larger MMCIDATALENGTH register\n ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants\n ARM: 6244/1: mmci: add variant data and default MCICLOCK support\n ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n ARM: 6274/1: add global control registers definition header file for nuc900\n mx2_camera: fix type of dma buffer virtual address pointer\n mx2_camera: Add soc_camera support for i.MX25/i.MX27\n arm/imx/gpio: add spinlock protection\n ARM: Add support for the LPC32XX arch\n ARM: LPC32XX: Arch config menu supoport and makefiles\n ARM: LPC32XX: Phytec 3250 platform support\n ARM: LPC32XX: Misc support functions\n ARM: LPC32XX: Serial support code\n ARM: LPC32XX: System suspend support\n ARM: LPC32XX: GPIO, timer, and IRQ drivers\n ARM: LPC32XX: Clock driver\n ...\n" }, { "commit": "7b70c4275f28702b76b273c8534c38f8313812e9", "tree": "1df2229ca02466bd1adda814ac5c37aa0a597db1", "parents": [ "ceb0885d3b01bb2e2f18765770e212914f2864be", "a20df564d15bd28e3df24e1c65b885bd74d23f17" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/kernel/entry-armv.S\n\tarch/arm/kernel/setup.c\n\tarch/arm/mm/init.c\n" }, { "commit": "ceb0885d3b01bb2e2f18765770e212914f2864be", "tree": "0952c90cd49704a9172e985ca491d79b60c40bc8", "parents": [ "b31fc7af78e17b0203e1cd5a195c590e8adeae0d", "08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/mm/init.c\n" }, { "commit": "74bc80931c8bc34d24545f992a35349ad548897c", "tree": "402cb830059e78812ba32d3aa9245cc82c3a8ca3", "parents": [ "831e8047eb2af310184a9d4d9e749f3de119ae39" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:58:59 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 30 23:16:32 2010 +0100" }, "message": "ARM: Fix Versatile/Realview/VExpress MMC card detection sense\n\nThe MMC card detection sense has become really confused with negations\nat various levels, leading to some platforms not detecting inserted\ncards. Fix this by converting everything to positive logic throughout,\nthereby getting rid of these negations.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ac8b422838046ffc26be4874a3cbae0d313f4209", "tree": "936c8fc9a45ca7a2973c878fc0e20bbae288e5f0", "parents": [ "ce3f9d71bd9c4268698109ad425625a2a8f51e22" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 21 22:38:13 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 21:07:39 2010 +0200" }, "message": "pcmcia: remove cs_types.h\n\nRemove cs_types.h which is no longer needed: Most definitions aren\u0027t\nused at all, a few can be made away with, and two remaining definitions\n(typedefs, unfortunatley) may be moved to more specific places.\n\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d50f58bbd979e86378dfdec982452041f0e604ef", "tree": "511938033b3346983175c70dd4d0afeb00b59b82", "parents": [ "129961ecaf21c9ee899ad9067d917c1aa172fb7a", "79d3c2c2395a89a70d25f0c77c11afc87efab89b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n" }, { "commit": "08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2", "tree": "c812872f484531e6d7a77ea14e22b7805f5856a4", "parents": [ "4380c14fd77338bac9d1da4dc5dd9f6eb4966c82" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:55:59 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:40:56 2010 +0100" }, "message": "ARM: 6246/1: mmci: support larger MMCIDATALENGTH register\n\nThe Ux500 variant has a 24-bit MMCIDATALENGTH register, as opposed to\nthe 16-bit one on the ARM version.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4380c14fd77338bac9d1da4dc5dd9f6eb4966c82", "tree": "1042ee4eec5b78c646fb75f6f8bb71328eb52673", "parents": [ "4956e10903fd3459306dd9438c1e714ba3068a2a" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:55:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:40:32 2010 +0100" }, "message": "ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants\n\nAlthough both the U300 and Ux500 use ST variants, the HWFCEN bits are at\ndifferent positions, so use the variant_data to store the information.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4956e10903fd3459306dd9438c1e714ba3068a2a", "tree": "2604ac9ef417563c1ef6fc98867d8c88993c256e", "parents": [ "bb8f563c848faa113059973f68c24a3bb6a9585e" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:54:40 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:39:56 2010 +0100" }, "message": "ARM: 6244/1: mmci: add variant data and default MCICLOCK support\n\nAdd a variant_data structure to handle the differences between the\nvarious variants of this peripheral. Add a first quirk for a default\nMCICLOCK value, required on the Ux500 variant where the enable bit needs\nto be always set, since it controls access to some registers.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bb8f563c848faa113059973f68c24a3bb6a9585e", "tree": "7ce9952411dd8ba1e9f438a62d586d9078f06212", "parents": [ "f5e2574e734650bbeb801a31cc99e628f9a027af" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:53:57 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:39:05 2010 +0100" }, "message": "ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n\nPlatforms may have some external power control which need to be\ncontrolled from board specific code. Rename the translate_vdd()\ncallback to vdd_handler() and pass it the power mode.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f5e2574e734650bbeb801a31cc99e628f9a027af", "tree": "e7705dae6e6be70cc7b20129471c2498f9def7ac", "parents": [ "528320db013b687c5f0150fd77eb4dc02ca328d1" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:50:31 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6239/1: mmci: let core poll for card detection\n\nUse the MMC core\u0027s ability to poll for card detection. This also has\nthe advantage of doing the gpio_get_value from a workqueue instead of\ntimer, allowing the gpio to be on a sleeping gpiochip.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "528320db013b687c5f0150fd77eb4dc02ca328d1", "tree": "b41c684bd16c2466f949229d55c2d11b48f61552", "parents": [ "4ce1d6cbf07271ab8f7cc47c3e27edeac08b58a7" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:49:49 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6238/1: mmci: fix multi block transfers\n\nFix the data transfer size to allow multi block transfers to work.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4ce1d6cbf07271ab8f7cc47c3e27edeac08b58a7", "tree": "ff2c3397828cda8d8455893f336e497bcdd6cb44", "parents": [ "2c39c9e149f45ec15a6985cb06ec8f6d904bb35e" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:44:58 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6237/1: mmci: use sg_miter API to fix multi-page sg handling\n\nThe mmci driver\u0027s SG list iteration logic assumes that each SG entry\nspans only one page, and only maps and flushes one page of the sg. This\nis not a valid assumption. Fix it by converting the driver to the\nsg_miter API, which correctly handles sgs which span multiple pages.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a7d403cfd1a4c8924874e0f6b600edb7f38684d0", "tree": "7b5ed459d186cf87e287120652bb1167e7b27e08", "parents": [ "d5efe2551e3ea88d9446f0d9d073debbb847f6af" ], "author": { "name": "Eric Bénard", "email": "eric@eukrea.com", "time": "Thu Jun 17 20:59:07 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jul 26 14:29:21 2010 +0200" }, "message": "mxcmmc: convert to pm_ops and enable/disable clock\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nCc: s.hauer@pengutronix.de\nCc: linux-mmc@vger.kernel.org\nCc: linux-arm-kernel@lists.infradead.org\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "2dcf78c0eeae3bd07082821557014f25f02ca2e9", "tree": "8ca5c4c7f35c9a9ab07fcd9732124c905e609aa1", "parents": [ "6b6322676add0fa2713d0ec89a28390fd4d907f5", "5109a4597f7e758b8d20694392d0361a0b4c43b1" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Jun 30 12:16:24 2010 +0200" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Jul 26 14:27:25 2010 +0200" }, "message": "Merge branch \u0027imx/for-2.6.36\u0027 of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD\n\nThere are some more conflicts than detected by git, namely support for\nthe newly added cpuimx machines needed to be converted to dynamic device\nregistration.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n\nConflicts:\n\tarch/arm/mach-imx/Makefile\n\tarch/arm/mach-imx/devices.c\n\tarch/arm/mach-imx/devices.h\n\tarch/arm/mach-imx/eukrea_mbimx27-baseboard.c\n\tarch/arm/mach-mx2/Kconfig\n\tarch/arm/mach-mx25/Makefile\n\tarch/arm/mach-mx25/devices.c\n\tarch/arm/plat-mxc/include/mach/mx25.h\n\tarch/arm/plat-mxc/include/mach/mxc_nand.h\n" }, { "commit": "16b3bf8c85a5dc821eea7f9bb48d13b32f42f7ee", "tree": "2b7bf9906b26f1995f9beb8b647704e07c7298d6", "parents": [ "ebfc7e6e13ea61d6f9b3e5353e63f4d185a516b9" ], "author": { "name": "Eric Bénard", "email": "eric@eukrea.com", "time": "Wed May 19 18:46:04 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jul 26 14:17:46 2010 +0200" }, "message": "mxcmmc: add card detect through DAT3 possibility\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "4e4f62bf7396fca48efe61513640ee399a6046e3", "tree": "42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2", "parents": [ "9e3288dc9a94fab5ea87db42177d3a9e0345a614", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "message": "Merge commit \u0027v2.6.35-rc6\u0027 into devicetree/next\n\nConflicts:\n\tarch/sparc/kernel/prom_64.c\n" }, { "commit": "9d51a6b2487724e8713cd2794cf09ffeee5f6932", "tree": "acd827ad096722944daa54b694342876abbcff79", "parents": [ "d45840d9f04be4d8c0288066f37bca3a448f7471" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Jul 20 13:24:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "sdhci-s3c: add missing remove function\n\nSystem will crash sooner or later once the memory with the code of the\ns3c-sdhci.ko module is reused for something else. I really have no idea\nhow the lack of remove function went unnoticed into the mainline code.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15", "tree": "ffbaba1c737fa5da32d9c1a503e58d2896f10be6", "parents": [ "959e85f7751c33d1a2dabc5cc3fe2ed0db7052e5" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 08 07:48:19 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 05 16:14:52 2010 -0600" }, "message": "of: refactor of_modalias_node() and remove explicit match table.\n\nThis patch tightens up the behaviour of of_modalias_node() to be more\npredicatable and to eliminate the explicit of_modalias_tablep[] that\nis currently used to override the first entry in the compatible list\nof a device. The override table was needed originally because spi\nand i2c drivers had no way to do of-style matching. Now that all\ndevices can have an of_node pointer, and all drivers can have an\nof_match_table, the explicit override table is no longer needed\nbecause each driver can specify its own OF-style match data.\n\nThe mpc8349emitx-mcu driver is modified to explicitly specify the\ncorrect device to bind against.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "f3d56144c86beb25c7d206efa66d6efba908371c", "tree": "f24757410e6c04537f9bc057fab0af8cb8fb2d5c", "parents": [ "6d7b7d578f2c182f77ab6dd1c375f848f38ea1a6" ], "author": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Mon May 24 10:15:00 2010 -0700" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Wed Jun 09 08:51:31 2010 -0700" }, "message": "mmc: msm: fix compile error on MSM7x30\n\nMSM7x30 isn\u0027t supported in this driver yet. If ones tried to compile it in\nwith MSM7x30 configure you get,\n\nlinux-2.6/drivers/mmc/host/msm_sdcc.c: In function \u0027msmsdcc_fifo_addr\u0027:\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: \u0027MSM_SDC1_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: (Each undeclared identifier is reported only once\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: for each function it appears in.)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:167: error: \u0027MSM_SDC2_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:169: error: \u0027MSM_SDC3_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:171: error: \u0027MSM_SDC4_PHYS\u0027 undeclared (first use in this function)\n\nSo we add a Kconfig check to prevent this.\n\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "999fd1ab344dabd9c985b638bf4c29495b8e4619", "tree": "b4a238aafc79caa085e469ee28ab61301ca17f8f", "parents": [ "9a9620db07b27700a4de9e86985735fffb78e2f8", "ac422f9443191e050c16fe99baeb5c3d74934589" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:42:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:42:09 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)\n sh: Make intc messages consistent via pr_fmt.\n sh: make sure static declaration on ms7724se\n sh: make sure static declaration on mach-migor\n sh: make sure static declaration on mach-ecovec24\n sh: make sure static declaration on mach-ap325rxa\n clocksource: sh_cmt: compute mult and shift before registration\n clocksource: sh_tmu: compute mult and shift before registration\n sh: PIO disabling for x3proto and urquell.\n sh: mach-sdk7786: conditionally disable PIO support.\n sh: support for platforms without PIO.\n usb: r8a66597-hcd pio to mmio accessor conversion.\n usb: gadget: r8a66597-udc pio to mmio accessor conversion.\n usb: gadget: m66592-udc pio to mmio accessor conversion.\n sh: add romImage MMCIF boot for sh7724 and Ecovec V2\n sh: add boot code to MMCIF driver header\n sh: prepare MMCIF driver header file\n sh: allow romImage data between head.S and the zero page\n sh: Add support MMCIF for ecovec\n sh: remove duplicated #include\n input: serio: disable i8042 for non-cayman sh platforms.\n ...\n" }, { "commit": "683eb94777c3c67b9b258765b9cb03641344c418", "tree": "c2983f24bef55dce6719e910ae05bfb07ec993f9", "parents": [ "bb21c7ce18eff8e6e7877ca1d06c6db719376e3c" ], "author": { "name": "Cory Maccarrone", "email": "darkstar6262@gmail.com", "time": "Fri Jun 04 14:15:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:21:45 2010 -0700" }, "message": "omap: remove BUG_ON for disabled interrupts\n\nRemove a BUG_ON for when interrupts are disabled during an MMC request.\n\nDuring boot, interrupts can be disabled when a request is made, causing\nthis bug to be triggered. In reality, there\u0027s no reason this should halt\nthe kernel, as the driver has proved reliable in spite of disabled\ninterrupts, and additionally, there\u0027s nothing in this code that would\nrequire interrupts to be enabled.\n\nThe only setup I\u0027ve managed to make it trigger on is on the HTC Herald\nduring bootup when the driver is built into the kernel (mostly because\nthat\u0027s all I have). I believe it\u0027s related to the fact that on bootup I\nget many timeout errors on \"CMD5\" while initializing the card. Each CMD5\ntimeout triggers that bug (I changed it to a WARN_ON to get it to boot in)\ndue to the fact that part of the timeout code involves sending the request\nagain. With interrupts turned off, that BUG would be triggered.\n\nSigned-off-by: Cory Maccarrone \u003cdarkstar6262@gmail.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "487d9fc5016529d7d77dfe35b666fd3a090e2953", "tree": "2cfcd7ed5bcbd6d8768f233770382a1378292f84", "parents": [ "b34bce45530ca897aea35915e0e42eb3c8047b52" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Tue May 18 14:42:51 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 31 13:11:41 2010 +0900" }, "message": "sh: prepare MMCIF driver header file\n\nUpdate the MMCIF driver to include register information\nand register access functions in the header file.\nThe MMCIF boot code builds on top of this.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "dc0fd7b56141999832a6bccda2f7e9765f0bc087", "tree": "fbd92ad8910f41865909d04198011492266b0752", "parents": [ "c63b3cba4f47ef9f4b3f952b4f923cf341d250ac" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 14:42:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "drivers/mmc/host: use ERR_CAST\n\nUse ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)). The former makes more\nclear what is the purpose of the operation, which otherwise looks like a\nno-op.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\ntype T;\nT x;\nidentifier f;\n@@\n\nT f (...) { \u003c+...\n- ERR_PTR(PTR_ERR(x))\n+ x\n ...+\u003e }\n\n@@\nexpression x;\n@@\n\n- ERR_PTR(PTR_ERR(x))\n+ ERR_CAST(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c63b3cba4f47ef9f4b3f952b4f923cf341d250ac", "tree": "dc472d6c93cd7878609752ebe74476b0701e0d96", "parents": [ "6c1f716e8154ee9315534782b9b1eedea0559a24" ], "author": { "name": "Viresh KUMAR", "email": "viresh.kumar@st.com", "time": "Wed May 26 14:42:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci-spear: ST SPEAr based SDHCI controller glue\n\nAdd a glue layer to support the sdhci driver on the ST SPEAr platform.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: \u003cshiraz.hashim@st.com\u003e\nCc: Linus Walleij \u003clinus.ml.walleij@gmail.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e", "tree": "3b4239740ca22d19780d05da92cdd203828ea17f", "parents": [ "a791daa15305e7e549a418ef0ae6bc4b4580066e" ], "author": { "name": "Matt Fleming", "email": "matt@console-pimps.org", "time": "Wed May 26 14:42:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: remove the \"state\" argument to mmc_suspend_host()\n\nEven though many mmc host drivers pass a pm_message_t argument to\nmmc_suspend_host() that argument isn\u0027t used the by MMC core. As host\ndrivers are converted to dev_pm_ops they\u0027ll have to construct\npm_message_t\u0027s (as they won\u0027t be passed by the PM subsystem any more) just\nto appease the mmc suspend interface.\n\nWe might as well just delete the unused paramter.\n\nSigned-off-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nAcked-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nAcked-by: Michal Miroslaw \u003cmirq-linux@rere.qmqm.pl\u003eZZ\nAcked-by: Sascha Sommer \u003csaschasommer@freenet.de\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a791daa15305e7e549a418ef0ae6bc4b4580066e", "tree": "ba85b141bc4ca93cc151449964ce4f903b110c93", "parents": [ "b417577d3b9bbb06a4ddc9aa955af9bd503f7242" ], "author": { "name": "Kevin Hilman", "email": "khilman@deeprootsystems.com", "time": "Wed May 26 14:42:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: OMAP HS-MMC: convert to dev_pm_ops\n\nConvert PM operations to use dev_pm_ops. This will facilitate the runtime\nPM coversion which will add to dev_pm_ops hooks.\n\nNote that dev_pm_ops version of the suspend hook no longer takes a \u0027state\u0027\nargument. However, the MMC core function mmc_suspend_host() still takes a\n\u0027state\u0027 argument, but it is unused, so a dummy state variable was created\nto pass to the MMC core.\n\nIn the future, the MMC core should be converted to drop this state\nargument and the rest of the MMC drivers could be easily converted to\ndev_pm_ops as well.\n\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Denis Karpov \u003cext-denis.2.karpov@nokia.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b417577d3b9bbb06a4ddc9aa955af9bd503f7242", "tree": "32ff825e6d4ee925eff02932b2954a449b060e56", "parents": [ "14c5aa6d3797c6b3d09193a8423472847f738526" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed May 26 14:42:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "omap_hsmmc: improve interrupt synchronisation\n\nThe following changes were needed:\n\t- do not use in_interrupt() because it will not work\n\twith threaded interrupts\n\nIn addition, the following improvements were made:\n\t- ensure DMA is unmapped only after the final DMA interrupt\n\t- ensure a request is completed only after the final DMA interrupt\n\t- disable controller interrupts when a request is not in progress\n\t- remove the spin-lock protecting the start of a new request from\n\tan unexpected interrupt because the locking was complicated and\n\ta \u0027req_in_progress\u0027 flag suffices (since the spin-lock only defers\n\tthe unexpected interrupts anyway)\n\t- instead use the spin-lock to protect the MMC interrupt handler\n\tfrom the DMA interrupt handler\n\t- remove the semaphore preventing DMA from being started while\n\tthe previous DMA is still in progress - the other changes make that\n\timpossible, so it is now a BUG_ON condition\n\t- ensure the controller interrupt status is clear before exiting\n\tthe interrrupt handler\n\nIn general, these changes make the code safer but do not fix any specific\nbugs so backporting is not necessary.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nTested-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "14c5aa6d3797c6b3d09193a8423472847f738526", "tree": "3263f14d77b515e492e9c3e0f112b0606fae98d6", "parents": [ "b2e75eff5e859d0c294e7405958362b26a423c6e" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Wed May 26 14:42:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci: enable multiblock transfers in sdhci-s3c\n\nWifi over SDIO doesn\u0027t work correctly without multiblock, so enable this.\nThis patch depends on the following patches:\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nCc: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b2e75eff5e859d0c294e7405958362b26a423c6e", "tree": "23616cc22cc08caf87b1fd3e3fff09ef03bff6ce", "parents": [ "70764a905785ebacc8d44fed7a12fba3db267ae6" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Wed May 26 14:42:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: s3c6410: enable ADMA feature in 6410 sdhci controller\n\nEnable the ADMA feature in the 6410 SDHCI controller driver.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70764a905785ebacc8d44fed7a12fba3db267ae6", "tree": "0d4fbf97f88182a8679af78d9de9b20f1b3916d0", "parents": [ "dc297c92e6e63af5cbd7e7d2f377247f5664a378" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Wed May 26 14:42:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: s3c6410: add new quirk in sdhci driver and update ADMA descriptor build\n\nThe s3c6410 sdhci controller does not support the \u0027End\u0027 attribute and NOP\nattribute in the same 8-Byte ADMA descriptor. This patch adds a new quirk\nto identify sdhci host contollers with such behaviour. In addition to\nthis, for controllers using the new quirk, the last entry in the ADMA\ndescritor table is marked with the \u0027End\u0027 attribute (instead of using a NOP\ndescriptor with \u0027End\u0027 attribute).\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dc297c92e6e63af5cbd7e7d2f377247f5664a378", "tree": "b84dd2a7f835a1922ffb18965277bba84c914bb0", "parents": [ "a751a7d69fe91e4640884ae02fe44ddceb7f4cd8" ], "author": { "name": "Matt Fleming", "email": "matt@console-pimps.org", "time": "Wed May 26 14:42:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci: build fix: rename SDHCI I/O accessor functions\n\nUnfortunately some architectures #define their read{b,w,l} and\nwrite{b,w,l} I/O accessors which makes the SDHCI I/O accessor functions of\nthe same names subject to preprocessing. This leads to the following\ncompiler error,\n\nIn file included from drivers/mmc/host/sdhci.c:26:\ndrivers/mmc/host/sdhci.h:318:35: error: macro \"writel\" passed 3 arguments, but takes just 2\n\nRename the SDHCI I/O functions so that CONFIG_MMC_SDHCI_IO_ACCESSORS can\nbe enabled for architectures that implement their read{b,w,l} and\nwrite{b,w,l} functions with macros.\n\nSigned-off-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Zhangfei Gao \u003czgao6@marvell.com\u003e\nAcked-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a751a7d69fe91e4640884ae02fe44ddceb7f4cd8", "tree": "298370106b5e85f3bba283c8a85e998dac5145d2", "parents": [ "88ff82ed4ff048c5548db9313b3de327c91234f8" ], "author": { "name": "Zhangfei Gao", "email": "zgao6@marvell.com", "time": "Wed May 26 14:42:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: SDHCI_INT_DATA_MASK typo error\n\nSigned-off-by: Zhangfei Gao \u003czgao6@marvell.com\u003e\nReviewed-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "88ff82ed4ff048c5548db9313b3de327c91234f8", "tree": "410aad3f7b8ad92983c64982f0dc5d2f6fefb6d5", "parents": [ "fdc50a9444b9781f4dd5aa5f7453300d2688cc5f" ], "author": { "name": "Anders Grahn", "email": "anders.grahn@hd-wireless.se", "time": "Wed May 26 14:42:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: atmel-mci: Add support for SDIO interrupts\n\nAtmel-mci support for SDIO interrupts. This adds the enable_sdio_irq()\nfunction and the configuration of sdio irq mask per slot. With this irq\nmask information, we keep the idea of multiple slot per sd/mmc host (not\nonly A and B). MMC_CAP_SDIO_IRQ is added according to slot configuration.\n\nA new little function is added to run mmc_signal_sdio_irq() during\ninterrupt handling routine.\n\nSigned-off-by: Anders Grahn \u003canders.grahn@hd-wireless.se\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fdc50a9444b9781f4dd5aa5f7453300d2688cc5f", "tree": "d1e1e29c06ec03ecb3b217dfcdfb49f0a5eb30e2", "parents": [ "99ddffd8ef84c0389e31cb4b90d9e5415ea19cb0" ], "author": { "name": "Yusuke Goda", "email": "yusuke.goda.sx@renesas.com", "time": "Wed May 26 14:41:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: add support MMCIF for SuperH\n\nMMCIF is the MMC Host Interface in SuperH.\n\nSigned-off-by: Yusuke Goda \u003cyusuke.goda.sx@renesas.com\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "99ddffd8ef84c0389e31cb4b90d9e5415ea19cb0", "tree": "75821d731ab191fd5d1475e83e955397b6ce6c6a", "parents": [ "6dd6bca3fb6d4f186cdc67ba9e3949ef456dcc53" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed May 26 14:41:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: atmel-mci: enable SD high speed support\n\nEnable high speed support for atmel-mci driver. This support is dependent\nof the revision of the IP and, of course, the capacity of the SD card\nused.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nReviewed-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bbce5802afc560c4a487afea3761b85fcb862fb3", "tree": "a484a542fff37b412276da7be5d6a91d928cf0ad", "parents": [ "06de845f72eeb169ea624f17396cd41d03384940" ], "author": { "name": "Chaithrika U S", "email": "chaithrika@ti.com", "time": "Wed May 26 14:41:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "davinci: mmc: updates to suspend/resume implementation\n\nImprove the suspend and resume callbacks in DaVinci MMC host controller\ndriver. Modify the reset status of the contorller and clock during\nsuspend and resume. Also migrate the power management callbacks from\nplatform driver to dev_pm_ops structure.\n\nTested on DA850/OMAP-L138 EVM.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Chaithrika U S \u003cchaithrika@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: Vipin Bhandari \u003cvipin.bhandari@ti.com\u003e\nCc: Sudhakar Rajashekhara \u003csudhakar.raj@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "06de845f72eeb169ea624f17396cd41d03384940", "tree": "48a77b4e2672551f05eee479355da1de7c88b1b9", "parents": [ "e632c45ad040a54058db577981cdc3f4b316da55" ], "author": { "name": "Chaithrika U S", "email": "chaithrika@ti.com", "time": "Wed May 26 14:41:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "davinci: mmc: add a function to control reset state of the controller\n\nAdd a helper function which will aid in changing the reset\nstatus of the controller.\n\nSigned-off-by: Chaithrika U S \u003cchaithrika@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: Vipin Bhandari \u003cvipin.bhandari@ti.com\u003e\nCc: Sudhakar Rajashekhara \u003csudhakar.raj@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e632c45ad040a54058db577981cdc3f4b316da55", "tree": "988c3348fa551ed26cc654e38986c9d5b98a20da", "parents": [ "a7626b7a5de37bbd506b23633be95428ee81c2e4" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed May 26 14:41:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "sdhci-pltfm: do not print errors in case of an extended iomem size\n\nSome hosts have an extended SDHCI iomem size, so the driver should\nonly print errors if the iomem size is less than 0x100.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nAcked-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@csr.com\u003e\nCc: Pierre Ossman \u003cpierre@ossman.eu\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a7626b7a5de37bbd506b23633be95428ee81c2e4", "tree": "5979fe207a53005d4dfbfb4d2a281f8dd20b3f08", "parents": [ "f27f47ef5b67106ff1cdeebf061387a7b30c12bc" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed May 26 14:41:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "sdhci-pltfm: implement platform data passing\n\nThis includes platform ops, quirks and (de)initialization callbacks.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nCc: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@csr.com\u003e\nCc: Pierre Ossman \u003cpierre@ossman.eu\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f27f47ef5b67106ff1cdeebf061387a7b30c12bc", "tree": "0238bc989cefa0df4e64eaa3c21c182c66c294c4", "parents": [ "0e950fa686d53a57ee6c47f477ecfc681670c6a9" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed May 26 14:41:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "sdhci: implement CAP_CLOCK_BASE_BROKEN quirk\n\nSome hosts (e.g. as found in CNS3xxx SOCs) report wrong value in\nCLOCK_BASE capability field, and currently there is no way to force the\nSDHCI core to use the platform-provided base clock value.\n\nThis patch implements CAP_CLOCK_BASE_BROKEN quirk. When enabled, the\nSDHCI core will always use base clock frequency provided by the platform.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nCc: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@csr.com\u003e\nCc: Pierre Ossman \u003cpierre@ossman.eu\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0e950fa686d53a57ee6c47f477ecfc681670c6a9", "tree": "ded26d5e60a5290dbfaa86b60eca049a8d0da51e", "parents": [ "ca2afb6dbea74ee762ae5856af7045a57a65e9c8" ], "author": { "name": "Marek Belisko", "email": "marek.belisko@open-nandra.com", "time": "Wed May 26 14:41:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc-omap: add support for 16-bit and 32-bit registers\n\nThe omap850 and omap730 use 16-bit registers instead of 32-bit, requiring\na modification of the register addresses in the mmc-omap driver. To\nresolve this, a bit shift is performed on base register addresses, either\nby 1 or 2 bits depending on the CPU in use. This yields the correct\nregisters for each CPU.\n\nSigned-off-by: Marek Belisko \u003cmarek.belisko@open-nandra.com\u003e\nSigned-off-by: Cory Maccarrone \u003cdarkstar6262@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Ladislav Michl \u003cladis@linux-mips.org\u003e\nCc: Ben Dooks \u003cben@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ca2afb6dbea74ee762ae5856af7045a57a65e9c8", "tree": "69bda961b3624d9a783f4ee1b52e973d0b9df507", "parents": [ "31f46717997a83bdf6db0dd04810c0a329eb3148" ], "author": { "name": "Sudhakar Rajashekhara", "email": "sudhakar.raj@ti.com", "time": "Wed May 26 14:41:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "davinci: mmc: pass number of SG segments as platform data\n\nOn some platforms like DM355, the number of EDMA parameter slots available\nfor EDMA_SLOT_ANY usage are few. In such cases, if MMC/SD uses 16 slots\nfor each instance of MMC controller, then the number of slots available\nfor other modules will be very few.\n\nBy passing the number of EDMA slots to be used in MMC driver from platform\ndata, EDMA slots available for other purposes can be controlled.\n\nMost of the platforms will not use this platform data variable. But on\nDM355, as the number of EDMA resources available is limited, the number of\nscatter- gather segments used inside the MMC driver can be 8 (passed as\nplatform data) instead of 16. On DM355, when the number of scatter-gather\nsegments was reduced to 8, I saw a performance difference of about\n0.25-0.4 Mbytes/sec during write. Read performance variations were\nnegligible.\n\nSigned-off-by: Sudhakar Rajashekhara \u003csudhakar.raj@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec96e2fe954c23a54bfdf2673437a39e193a1822", "tree": "e4041c68ef20a3337c56aefc8db785156307edd1", "parents": [ "8e9815a0f8882aaa68645b001bb7538db8886802", "f949c0edd84101bfd30b3e7389c1a12b067e561d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)\n ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900\n ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline\n ARM: 6140/1: silence a bogus sparse warning in unwind.c\n ARM: mach-at91: duplicated include\n ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup\n ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup\n ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup\n ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup\n ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup\n ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup\n ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup\n ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup\n ARM: SPEAR6xx: remove duplicated #include\n ARM: s3c6400_defconfig: Add NAND driver\n ARM: s3c6400_defconfig: enable sound as modules\n ARM: s3c6400_defconfig: enable power management\n ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34\n ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34\n ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34\n ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34\n ...\n" }, { "commit": "0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6", "tree": "a9be0f082d3c2f53eb2d5f9de9ad900c31236b34", "parents": [ "0163916f1db7f345963dad1af78b7628c759c6ee", "41ec7ebee14189a0424176279c227168960c28ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (25 commits)\n sh: fix up sh7785lcr_32bit_defconfig.\n arch/sh/lib/strlen.S: Checkpatch cleanup\n sh: fix up sh7786 dmaengine build.\n sh: guard cookie consistency across termination in the DMA driver\n sh: prevent the DMA driver from unloading, while in use\n sh: fix Oops in the serial SCI driver\n sh: allow platforms to specify SD-card supported voltages\n mmc: let MFD\u0027s provide supported Vdd card voltages to tmio_mmc\n sh: disable SD-card write-protection detection on kfr2r09\n mfd: pass platform flags down to the tmio_mmc driver\n tmio: add a platform flag to disable card write-protection detection\n sh: Add SDHI DMA support to migor\n sh: Add SDHI DMA support to kfr2r09\n sh: Add SDHI DMA support to ms7724se\n sh: Add SDHI DMA support to ecovec\n mmc: add DMA support to tmio_mmc driver, when used on SuperH\n sh: prepare the SDHI MFD driver to pass DMA configuration to tmio_mmc.c\n mmc: prepare tmio_mmc for passing of DMA configuration from the MFD cell\n sh: add DMA slave definitions to sh7724\n sh: add DMA slaves for two SDHI controllers to sh7722\n ...\n" }, { "commit": "a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486", "tree": "b4958eebca382ca616622e3abf148853e4f84f5e", "parents": [ "8f4b3036d1b9bdb6f5fa0b920e0163d64a990327" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:37:25 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:21 2010 +0900" }, "message": "mmc: let MFD\u0027s provide supported Vdd card voltages to tmio_mmc\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "ac8fb3e8627d5494f3d2221925a82be4c1778b0e", "tree": "5e2e62928e4eeb67aac2363b613ec087546912d6", "parents": [ "65a1b0347a329422e939e14daae6dad9a29e9cf2" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:36:02 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:21 2010 +0900" }, "message": "tmio: add a platform flag to disable card write-protection detection\n\nWrite-protection status is not always available, e.g., micro-SD cards do not\nhave a write-protection switch at all. This patch adds a flag to let platforms\nforce tmio_mmc to consider the card writable.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "311f3ac76826bfd8ed6213ded91ec947df164def", "tree": "c848087c301930bd0104441de82d9c13c97c2f09", "parents": [ "056676dabd9f4c69a6adcad208e9aa2ca7241400" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:34:22 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 16:51:18 2010 +0900" }, "message": "mmc: add DMA support to tmio_mmc driver, when used on SuperH\n\nSDHI controllers on SuperH, served by the tmio_mmc driver, can use slave DMA\nfor data transfer. This patch adds support for the dmaengine API to the\ntmio_mmc driver.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "6f68fbaafbaa033205cd131d3e1f3c4b914e9b78", "tree": "56b434496064ed170f94381e3ec4c6c340b71376", "parents": [ "6e4513972a5ad28517477d21f301a02ac7a0df76", "0b28330e39bbe0ffee4c56b09fc415fcec595ea3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n DMAENGINE: extend the control command to include an arg\n async_tx: trim dma_async_tx_descriptor in \u0027no channel switch\u0027 case\n DMAENGINE: DMA40 fix for allocation of logical channel 0\n DMAENGINE: DMA40 support paused channel status\n dmaengine: mpc512x: Use resource_size\n DMA ENGINE: Do not reset \u0027private\u0027 of channel\n ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device\n ioat3: disable cacheline-unaligned transfers for raid operations\n ioat2,3: convert to producer/consumer locking\n ioat: convert to circ_buf\n DMAENGINE: Support for ST-Ericssons DMA40 block v3\n async_tx: use of kzalloc/kfree requires the include of slab.h\n dmaengine: provide helper for setting txstate\n DMAENGINE: generic channel status v2\n DMAENGINE: generic slave control v2\n dma: timb-dma: Update comment and fix compiler warning\n dma: Add timb-dma\n DMAENGINE: COH 901 318 fix bytesleft\n DMAENGINE: COH 901 318 rename confusing vars\n" }, { "commit": "da7806f9b0579a1150f01ade3b562e543ddcbf2c", "tree": "185b67eb27abfa5ea65f0365b1f95b7f9d3abd9d", "parents": [ "d515e86e639890b33a09390d062b0831664f04a2", "1cd2296909e77702c68021ede9d87a1d967a6a99" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 14:38:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 14:38:35 2010 -0700" }, "message": "Merge branch \u0027msm-mmc_sdcc\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm\n\n* \u0027msm-mmc_sdcc\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm:\n drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support\n mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction\n mmc: msm_sdcc: Fix the dma exec function to use the proper delays\n mmc: msm_sdcc: Don\u0027t set host-\u003ecurr.mrq until after we\u0027re sure the busclk timer won\u0027t fire\n mmc: msm_sdcc: Enable busclk idle timer for power savings\n mmc: msm_sdcc: Don\u0027t disable interrupts while suspending\n mmc: msm_sdcc: Fix issue where we might not end a sucessfull request\n mmc: msm_sdcc: Featurize busclock power save and disable it by default\n mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled\n mmc: msm_sdcc: Reduce command timeouts and improve reliability.\n mmc: msm_sdcc: Schedule clock disable after probe\n mmc: msm_sdcc: Wrap readl/writel calls with appropriate clk delays\n mmc: msm_sdcc: Driver clocking/irq improvements\n msm: Add \u0027execute\u0027 datamover callback\n mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register\n mmc: msm_sdcc: Clean up clock management and add a 10us delay after enabling clocks\n" }, { "commit": "9bfe99a8f95122f83f3c894b1071b61e2b6d4990", "tree": "e322752b04deb314b579cae2c5c9993453775823", "parents": [ "f72caf7e496465182eeda842ac66a5e75404ddf1", "54c1f6367c2836a85e821a010085ed04ab2235bc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 20 23:43:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu May 20 23:43:18 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n" }, { "commit": "1d3c6ff44ad4b5f113602e153026a338f0f9b3ff", "tree": "1e1f2932634fc6d0e4acfe68496c1c727b83a13e", "parents": [ "7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639", "717e7c2672e37253a4d3aa70e4716b5b0a658761" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:37:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:37:22 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)\n ARM: remove \u0027select GENERIC_TIME\u0027\n ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO\n ARM: 6074/1: oprofile: convert from sysdev to platform device\n ARM: 6073/1: oprofile: remove old files and update KConfig\n ARM: 6072/1: oprofile: use perf-events framework as backend\n ARM: 6071/1: perf-events: allow modules to query the number of hardware counters\n ARM: 6070/1: perf-events: add support for xscale PMUs\n ARM: 6069/1: perf-events: use numeric ID to identify PMU\n ARM: 6064/1: pmu: register IRQs at runtime\n ARM: Optionally allow ARMv6 to use \u0027normal, bufferable\u0027 memory for DMA\n ARM: 6134/1: Handle instruction cache maintenance fault properly\n ARM: nwfpe: allow debugging output to be configured at runtime\n ARM: rename mach_cpu_disable() to platform_cpu_disable()\n ARM: 6132/1: PL330: Add common core driver\n ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310\n ARM: Move memory mapping into mmu.c\n ARM: Ensure meminfo is sorted prior to sanity_check_meminfo\n ARM: Remove useless linux/bootmem.h includes\n ARM: convert /proc/cpu/aligment to seq_file\n arm: use asm-generic/scatterlist.h\n ...\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0b28330e39bbe0ffee4c56b09fc415fcec595ea3", "tree": "fcf504879883763557e696eff81427b1ab78f76b", "parents": [ "058276303dbc4ed089c1f7dad0871810b1f5ddf1", "caa20d974c86af496b419eef70010e63b7fab7ac" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "message": "Merge branch \u0027ioat\u0027 into dmaengine\n" }, { "commit": "058276303dbc4ed089c1f7dad0871810b1f5ddf1", "tree": "df26ff701721b2a91d61bd29e48bad7cbcedd746", "parents": [ "4aed79b2818e7330b5d00143e4c20bc6555df91f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon May 17 16:30:42 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:42 2010 -0700" }, "message": "DMAENGINE: extend the control command to include an arg\n\nThis adds an argument to the DMAengine control function, so that\nwe can later provide control commands that need some external data\npassed in through an argument akin to the ioctl() operation\nprototype.\n\n[dan.j.williams@intel.com: fix up some missed conversions]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ac1d426e825ab5778995f2f6f053ca2e6b45c622", "tree": "75b91356ca39463e0112931aa6790802fb1e07a2", "parents": [ "fda0e18c8a7a3e02747c2b045b4fcd2c920410b9", "a3685f00652af83f12b63e3b4ef48f29581ba48b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/include/asm/system.h\n\tarch/arm/mm/Kconfig\n" }, { "commit": "4a31f2eff3b8fcf009db35f89eb222ed7835b6b9", "tree": "d66ba9333096b167248ab0a10c3bde6c0a19cfd6", "parents": [ "a2ef4562c25317f3d0731e79eb432db8ed9eb1ca" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Tue Apr 27 12:24:42 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon May 17 11:44:13 2010 +0200" }, "message": "ARM: mx3: Fix a race condition in mxcmmc\n\nFrom cefcdab08d1c9636c4a7290bc2bbe937d051bce4 Mon Sep 17 00:00:00 2001\nFrom: Volker Ernst \u003cvolker.ernst@txtr.com\u003e\nDate: Mon, 26 Apr 2010 22:51:07 +0200\nSubject: [PATCH] ARM: mx3: Fix a race condition in mxcmmc\n\nThis fixes a race condition regarding interrupt bits in the SDHC\ncontroller driver code.\n\nIn case of PIO-transfer it does not clear SDHC-status bit#11/12\nin the INT-handler anymore. INT-handler might be called during\nan ongoing PIO-data-transfer (with some other INT-flag set) and\nPIO-transfer depends on these bits being set to detect the end\nof the data-transfer. This also means that at the end of PIO-\ntransfer that PIO-software has to clear these bits itself.\n\nHowever in case of DMA-transfer these bits have to be cleared\nin the INT-handler, because they are used to generate INTs then.\n\nWorks solid, no more problems here, can transfer big files.\n\nSigned-off-by: Volker Ernst \u003cvolker.ernst@txtr.com\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Andy Green \u003candy@warmcat.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "bdef2fe88b1e4bde7458aedd207929ce3f9d66ee", "tree": "379dda36d68de2ed79bfe08764378e28503c6190", "parents": [ "3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Sat May 15 12:32:31 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:48:10 2010 -0700" }, "message": "mmc: at91_mci: modify cache flush routines\n\nAs we were using an internal dma flushing routine, this patch changes to\nthe DMA API flush_kernel_dcache_page(). Driver is able to compile now.\n\n[akpm@linux-foundation.org: flush_kernel_dcache_page() comes before kunmap_atomic()]\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d586ebbb8814e039545d38f69029533f3f17748d", "tree": "79bfc8c4de310e17e26fb8c9ecb526998f48c414", "parents": [ "abc2c9fdf636c4335a8d72ac3c5ae152bca44b68" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue May 11 14:06:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "mmc: atmel-mci: fix in debugfs: response value printing\n\nIn debugfs, printing of command response reports resp[2] twice: fix it to\nresp[3].\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nHaavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "abc2c9fdf636c4335a8d72ac3c5ae152bca44b68", "tree": "7eb0066462acc9366ddca9d882473195b8c505cb", "parents": [ "009a891b22395fc86e5f34057d79fffee4509ab5" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue May 11 14:06:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "mmc: atmel-mci: remove data error interrupt after xfer\n\nDisable data error interrupts while we are actually recording that there\nis not such errors. This will prevent, in some cases, the warning message\nprinted at new request queuing (in atmci_start_request()).\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "009a891b22395fc86e5f34057d79fffee4509ab5", "tree": "d481fdd81ce2e0c561dd22b07cae998ee9d0b72c", "parents": [ "ebb1fea9b3adf25d7e2f643c614163af4f93a17f" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue May 11 14:06:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "mmc: atmel-mci: prevent kernel oops while removing card\n\nThe removing of an SD card in certain circumstances can lead to a kernel\noops if we do not make sure that the \"data\" field of the host structure is\nvalid. This patch adds a test in atmci_dma_cleanup() function and also\ncalls atmci_stop_dma() before throwing away the reference to data.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ebb1fea9b3adf25d7e2f643c614163af4f93a17f", "tree": "fcfd016844b9b505417ff2cf76d5dc6651bfdae7", "parents": [ "34441427aab4bdb3069a4ffcda69a99357abcb2e" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue May 11 14:06:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 17:33:41 2010 -0700" }, "message": "mmc: atmel-mci: fix two parameters swapped\n\nTwo parameters were swapped in the calls to atmci_init_slot().\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nReported-by: Anders Grahn \u003canders.grahn@hd-wireless.se\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f97cab28b1895ecb0aa317cc785bb209f57fc1e8", "tree": "6bb09cf5ff94d39fd1a7ed1691ceb7e0ea674955", "parents": [ "e66b6d8e86a67c637203684ab76ea760dccb10f9" ], "author": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Apr 14 07:00:42 2010 +0800" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Tue May 11 17:25:04 2010 +0200" }, "message": "[ARM] pxa: make it clear by converting MMC \u0027delay_detect\u0027 to millisecond\n\ndelay_detect in HZ is confusing, convert it to be millisecond based. And\nthus remove those unnecessary call to msecs_to_jiffies() at runtime for\nthis field. Other constants are converted assuming HZ \u003d\u003d 100, which are\nbasically true for those platforms.\n\nThe assignment in csb726.c was incorrect, and is fixed in this patch as\na result.\n\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nAcked-by: Marc Zyngier \u003cmaz@misterjones.org\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nAcked-by: Mike Rapoport \u003cmike@compulab.co.il\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\n" }, { "commit": "808d97ccbe8e8251b1435e86c762965fd7e8a75e", "tree": "b45e594937a226c4d346240f9d3387c4cd8e5b8a", "parents": [ "771dc157e06d69fcece0b2c8a29b9010345d8e9a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 08 07:39:38 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 14 16:08:18 2010 +0100" }, "message": "ARM: 6033/1: ARM: MMCI: pass max frequency from platform\n\nThis introduce the field f_max into the mmci_platform_data,\nmaking it possible to pass in a desired block clocking frequency\nfrom a board configuration. This is often more desirable than\nusing a module parameter. We keep the module parameter as a\nfallback as well as the default frequency specified for this\nparameter if a parameter is not provided.\n\nThis also adds some kerneldoc style documentation to the\nplatform data struct in mmci.h.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "771dc157e06d69fcece0b2c8a29b9010345d8e9a", "tree": "69fb6b536735af812feca84a734d869e57844b47", "parents": [ "8e797a7e4f588fb3b9cfe9860b00dcd3b14f8b60" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 08 07:38:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 14 16:08:17 2010 +0100" }, "message": "ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro version\n\nThis adds support for an 8bit wide bus to the card (data lines\nMCIDAT0 through 7 exist) on the ST Micro version and alters the\nU300 platform to support this. Also add some ST_ prefix to the\nST-specific registers.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3fcb027d7fd749569665d34a79ce2a8e00bc2ed6", "tree": "154b65062a5e2c0ff94c9463c8dfe7bfc905affd", "parents": [ "f441b993101d4ee95222ccbaad1e0dd53ea90b64" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Thu Apr 01 10:03:25 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 14 09:18:07 2010 +0200" }, "message": "ARM: MXC: mxcmmc: work around a bug in the SDHC busy line handling\n\nMX3 SoCs have a silicon bug which corrupts CRC calculation of\nmulti-block transfers when connected SDIO peripheral doesn\u0027t drive the\nBUSY line as required by the specs.\n\nOne way to prevent this is to only allow 1-bit transfers.\n\nAnother way is playing tricks with the DMA engine, but this isn\u0027t\nmainline yet. So for now, we live with the performance drawback of 1-bit\ntransfers until a nicer solution is found.\n\nThis patch introduces a new host controller callback \u0027init_card\u0027 which\nis for now only called from mmc_sdio_init_card().\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Volker Ernst \u003cvolker.ernst@txtr.com\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Michał Mirosław \u003cmirqus@gmail.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "f441b993101d4ee95222ccbaad1e0dd53ea90b64", "tree": "66f23ad023c7e06257b3c7f0a1f4b80dc02e4455", "parents": [ "4725f6f17691f4602e3e31d785da5a461a16ccfe" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Thu Apr 01 10:03:24 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 14 09:18:07 2010 +0200" }, "message": "ARM: MXC: mxcmmc: Teach the driver SDIO operations\n\nSuccessfully tested on MX31 hardware using libertas SDIO peripherals.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Volker Ernst \u003cvolker.ernst@txtr.com\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Michał Mirosław \u003cmirqus@gmail.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "4725f6f17691f4602e3e31d785da5a461a16ccfe", "tree": "8c4215fda7650ee57eaa26ca9618a2a2b2e82148", "parents": [ "066fb8472036805e31ee002097f619815e25a127" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Thu Apr 01 10:03:23 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 14 09:18:06 2010 +0200" }, "message": "ARM: MXC: mxcmmc: misc cleanups\n\nBe more verbose on error messages and add one debug message.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Volker Ernst \u003cvolker.ernst@txtr.com\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Michał Mirosław \u003cmirqus@gmail.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "cdeebaddb7f97298c73df4d43d31e164fc8aa0e4", "tree": "5e1c873e05299743b5df3f48da2427246f635c58", "parents": [ "2a481800caf78f4750cc673c8baed12b5d703ff6" ], "author": { "name": "Madhusudhan Chikkature", "email": "madhu.cr@ti.com", "time": "Tue Apr 06 14:34:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:03 2010 -0700" }, "message": "omap hsmmc: fix a bug in card remove scenario\n\nThe reset of data lines when the card is removed from the cage results in\na failure.The failure is seen if the card is removed from the cage when TC\nis pending after a CMD with data received CC.The reset logic leaves the\ncontroller in a state where niether a TC is received nor DTO.\n\nThe rest code can be safely removed here since it is taken care in the IRQ\nhandler.\n\nSigned-off-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "c3635c78e500a52c9fcd55de381a72928d9e054d", "tree": "87403f402227cd8b5572550e70facf81c9eaa0d9", "parents": [ "0f65169b1bf44220308e1ce1f6666ad03ddc27af" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "message": "DMAENGINE: generic slave control v2\n\nConvert the device_terminate_all() operation on the\nDMA engine to a generic device_control() operation\nwhich can now optionally support also pausing and\nresuming DMA on a certain channel. Implemented for the\nCOH 901 318 DMAC as an example.\n\n[dan.j.williams@intel.com: update for timberdale]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "1cd2296909e77702c68021ede9d87a1d967a6a99", "tree": "bfd7f91e16d7384cb8b09e287e6e5923909ce729", "parents": [ "d0719e59f4ad96616f7c02ef0201667e41778c88" ], "author": { "name": "San Mehat", "email": "san@google.com", "time": "Wed Feb 03 12:59:29 2010 -0800" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Thu Mar 18 13:37:24 2010 -0700" }, "message": "drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "d0719e59f4ad96616f7c02ef0201667e41778c88", "tree": "51c30578d5942737d549700c5c28a3d200340d4d", "parents": [ "6ac9ea69069804d357064357d0082b0eab4c87ce" ], "author": { "name": "San Mehat", "email": "san@google.com", "time": "Thu Dec 03 10:58:54 2009 -0800" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Thu Mar 18 13:37:23 2010 -0700" }, "message": "mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction\n\nmsmsdcc_enable_clocks() was incorrectly being called depending on\nthe state of host-\u003eclks_on. This means the busclk idle timer was never\nbeing deleted if the clock was already on.. Bogus.\n\n Also fixes a possible double clk disable if the call to\ndel_timer_sync() in msmsdcc_disable_clocks() raced with\nthe busclk timer.\n\nSigned-off-by: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "6ac9ea69069804d357064357d0082b0eab4c87ce", "tree": "33fd578d5efde5cd0c671d41e37397d5c2ecb9a1", "parents": [ "91bb64952a8c57826b01878925bea8831c71a492" ], "author": { "name": "San Mehat", "email": "san@google.com", "time": "Wed Dec 02 17:24:58 2009 -0800" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Thu Mar 18 13:37:22 2010 -0700" }, "message": "mmc: msm_sdcc: Fix the dma exec function to use the proper delays\n\nSigned-off-by: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "91bb64952a8c57826b01878925bea8831c71a492", "tree": "346a725d560ff07087b9b8b88f9e3c13b60c053b", "parents": [ "24bbd7d5b422cde6a149ac2f9ac6e61e66536532" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Dec 02 17:21:07 2009 -0800" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Thu Mar 18 13:37:21 2010 -0700" }, "message": "mmc: msm_sdcc: Don\u0027t set host-\u003ecurr.mrq until after we\u0027re sure the busclk timer won\u0027t fire\n\nSigned-off-by: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "24bbd7d5b422cde6a149ac2f9ac6e61e66536532", "tree": "c0abdf5257452c8b6d1778e4f2bb4bd686f26a0b", "parents": [ "673ce00d7cb4ec060b5091992959da4a1d91c634" ], "author": { "name": "San Mehat", "email": "san@google.com", "time": "Tue Dec 01 10:10:47 2009 -0800" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Thu Mar 18 13:37:20 2010 -0700" }, "message": "mmc: msm_sdcc: Enable busclk idle timer for power savings\n\nSigned-off-by: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" } ], "next": "673ce00d7cb4ec060b5091992959da4a1d91c634" }