aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc
AgeCommit message (Collapse)Author
2011-06-29mmc: Retry a read/write req when error is EAGAINUlf Hansson
If the error returned for a read/write operation is EAGAIN, execute the request again. A host driver may utilize this option to trigger a retry of the exact same request, which may be useful for HW workarounds. ST-Ericsson Linux next: ST-Ericsson ID: 342919 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia14af2f2324fe8f2cbfe4b6cd07fb39b3209ec4f Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25169 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Reviewed-by: P.Hanumath PRASAD <hanumath.prasad@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-06-17SDIO: Fix deadlock when destroying IRQ work queueStefan Nilsson XK
This patch fixes a deadlock in sdio_release_irq. If there was work scheduled that had not yet claimed the mmc host at the point of calling sdio_release_irq, then it never could claim the host since the caller of sdio_release_irq already had claimed the host. Now the host is released to allow the work queue to flush out any pending work. A check is also added to make sure IRQ:s are not enabled as a consequence of this cleanup work. ST-Ericsson Linux next: NA ST-Ericsson ID: ER339608 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I700719e10c779d69561f0cc66b1df5fb41cbd21e Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24675 Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Reviewed-by: QATEST
2011-06-17mmc: Fix hangs related to insert/remove of cardsUlf Hansson
In the error handling of mmc_attach(sd|mmc|sdio) functions, the bus can be detached. A detach triggered also a power_off, which was the key reason to the issue. If a power_off has been done, the framework must never send any new commands/requests to the host driver, without first doing a new power_up. This occured in the rescan sequence most likely triggering ANY host driver to hang. Moving power_off out of detach and instead handle power_off separate when it is actually needed, solves the issue. ST-Ericsson Linux next: - ST-Ericsson ID: 339637 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I9fefe95c4331b98b9f460b8309594ed32037cf2f Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23841 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Reviewed-by: Joakim AXELSSON <joakim.axelsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-06-17mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()Jaehoon Chung
mmc_rescan_try_freq() tries to init two times with the last frequency. For example, if host->f_min is 400KHz, we see the message below: mmc1: mmc_rescan_try_freq: trying to init card at 400000 Hz mmc1: mmc_rescan_try_freq: trying to init card at 400000 Hz Andy Ross says that he didn't try this code on a board with an f_min that exactly matches one of the table entries, which explains why the bug wasn't detected. Change-Id: I57eb076aefb073421260de348364d290117198e1 Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Andy Ross <andy.ross@windriver.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23443 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Reviewed-by: Daniel WILLERUD <daniel.willerud@stericsson.com> Reviewed-by: Joakim AXELSSON <joakim.axelsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-06-17mmci: Use StartBitErr to detect bad connectionsPhilippe Langlais
Stresstesting insert/remove of SD-cards can trigger a StartBitErr. This made the driver to hang in forever waiting for a non ocurring data timeout. Change-Id: I7a5fa5571670b8bf553f76d61f15e9ae2f4dd937 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23584 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: drivers/mmc/host/mmci.c drivers/mmc/host/mmci.h
2011-06-17mmci: Fixed calculation of f_minUlf Hansson
For the st_clkdiv variant f_min is now calculated correctly. Change-Id: Ibc7a2ba149b6e15bcd4091b77b131437d8cd268b Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23452 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
2011-06-17SDIO: Clean work queue before destroyStefan Nilsson XK
Make sure to clean up any delayed works on the SDIO IRQ work queue before destroying it. ST-Ericsson Linux next: Not tested ST-Ericsson ID: AP340422 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Idd4236bd1d6ce30fd17b602bfff3f1f2b8303289 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23053 Reviewed-by: QATEST Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-26Merge commit 'linaro-11.05-2.6.38' into ste-dev-master-2.6.38-genericPhilippe Langlais
2011-05-22Merge commit 'v2.6.38.7' into linaro-2.6.38Nicolas Pitre
Conflicts: mm/memory.c
2011-05-21Revert "mmc: fix a race between card-detect rescan and clock-gate work ↵Chris Ball
instances" commit 86f315bbb2374f1f077500ad131dd9b71856e697 upstream. This reverts commit 26fc8775b51484d8c0a671198639c6d5ae60533e, which has been reported to cause boot/resume-time crashes for some users: https://bbs.archlinux.org/viewtopic.php?id=118751. Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-18SDIO: Optimized SDIO IRQ handlingStefan Nilsson XK
If there is only 1 function registered, and IRQ:s are supported and currently enabled, then there is no need to check the CCCR registers. ST-Ericsson ID: ER318044 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I99699bc6bb7e28b43bb88c977c1b8a09ad877ae3 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21666 Reviewed-by: QATEST Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-18SDIO: Replace IRQ kthread with work queueStefan Nilsson XK
To make the IRQ handling of the SDIO framework more robust, the kernel thread that used to handle SDIO IRQ:s is replaced with a work queue. Both polling and regular IRQ mode is still supported. ST-Ericsson ID: ER318044 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ibc1d10c00c972091d8880bd51962b5b45aa11ab3 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21665 Reviewed-by: QATEST Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-18mmci: allow rising/falling card detection interruptsHanumath Prasad
Allow card detection interrupts to be rising/falling to detect discrete removal/insertion events properly ST-Ericsson Id: WP 257117 Signed-off-by: Hanumath Prasad <hanumath.prasad@stericsson.com> Change-Id: I8738e0852dea9013119fbb628057eb29b8932e2d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21166 Reviewed-by: Preetham-rao K <preetham.rao@stericsson.com> Tested-by: Preetham-rao K <preetham.rao@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-05-18mmci: provide a debugfs view of the MMCI registersPhilippe Langlais
ST-Ericsson Linux next: N/A ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I24af7908715e576aef7fab8f9f0ba778e528af99 Signed-off-by: Ludovic Barre <ludovic.barre@stericsson.com> Change-Id: I24af7908715e576aef7fab8f9f0ba778e528af99 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16962 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Tested-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Conflicts: drivers/mmc/host/mmci.c
2011-05-18MMCI: DMA support for SDIOPhilippe Langlais
When the data size is less than fifosize the DMA job will not be setup and then we fallback to pio mode. Move setup of SDIO specific things to be done before the DMA might be setup. Change-Id: I8daab38afe8e77a1416293cb34bbdbffd42b80c9 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18730 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Conflicts: drivers/mmc/host/mmci.c
2011-05-18MMCI: Fixup handling of MCI_SDIOIT irq maskPhilippe Langlais
Make sure the MCI_SDIOIT irq mask is never accessed and modified without holding the host spinlock. As well re-order some actions in the enable and disable functions to handle SDIO irq wakeups event sequence correctly. Change-Id: Ia24fa162ee13ac767828bcca19c1ccd31cc7f695 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16948 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Conflicts: drivers/mmc/host/mmci.c
2011-05-16mmc: omap: Fix possible NULL pointer derefMichael Buesch
Either OMAP_MMC_STAT_CARD_ERR or OMAP_MMC_STAT_END_OF_CMD might fire if there is no host->cmd pointer. Check for a valid host->cmd pointer before calling mmc_omap_cmd_done(). Signed-off-by: Michael Buesch <mb@bu3sch.de> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Chris Ball <cjb@laptop.org> (cherry picked from commit f69475142136c8ad9b9c717aea2ff907aed9f863)
2011-05-16Merge commit 'v2.6.38.6' into linaro-2.6.38Nicolas Pitre
2011-05-13MMCI: Fixup sg buffer handling in mmci_pio_irq.Dmitry Tarnyagin
Earlier code was expecting that mmci_pio_write() returns not more than 'remain' bytes transferred. It is not the case for buffers which are not multiple of 4 bytes length. The patch fix the problem by checking result of mmci_pio_write(). The fault was introduced in the change: I2e506ec1f5a7fadf9780c18d8d31573eaf048273 MMCI: Fixup sg buffer handling in pio_write
2011-05-13MMCI: Use CLK_BYPASS together with NEG_EDGEPhilippe Langlais
To make use of CLK_BYPASS bit in the MMCICLOCK register the NEG_EDGE bit must be set as well to get a correct clock signal. ST-Ericsson ID: 325385 Change-Id: I86c9ec67b49c24621372984e0eca5963c339a6b0 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17398 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Tested-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Conflicts: drivers/mmc/host/mmci.c
2011-05-13MMCI: Increase HW flow control workaroundStefan Nilsson XK
There is a HW pecularity when writing packets with size <= 8 bytes to PL18X. Previously HW flow control was disabled for sizes < 8 bytes, but it needs to be disabled also for sizes == 8 bytes. Since HW flow control is not really needed for anything that fits in the HW FIFO of PL18X, we now instead disable HW flow control for any write operation that is smaller than or equal to the FIFO size. ST-Ericsson ID: ER326261 Change-Id: Ifa27d47a4c79b2c4542bba5cf2cfc30297403cd0 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17137 Reviewed-by: QATOOLS Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
2011-05-13mmci: Fix after db8500v2 revert mergePhilippe Langlais
2011-05-13mmci/pl180: Support for ST-Ericsson db8500v2Philippe Langlais
ST-Ericsson modified ARM PrimeCell PL180 block has not got an updated corresponding amba-id, althought the IP block has changed in db8500v2. The change was done to the datactrl register. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-05-09mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finishChris Ball
commit 0c9c99a765321104cc5f9c97f949382a9ba4927e upstream. It seems that under certain circumstances the sdhci_tasklet_finish() call can be entered with mrq set to NULL, causing the system to crash with a NULL pointer de-reference. Seen on S3C6410 system. Based on a patch by Dimitris Papastamos. Reported-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finishBen Dooks
commit b7b4d3426d2b5ecab21578eb20d8e456a1aace8f upstream. It seems that under certain circumstances that the sdhci_tasklet_finish() call can be entered with mrq->cmd set to NULL, causing the system to crash with a NULL pointer de-reference. Unable to handle kernel NULL pointer dereference at virtual address 00000000 PC is at sdhci_tasklet_finish+0x34/0xe8 LR is at sdhci_tasklet_finish+0x24/0xe8 Seen on S3C6410 system. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()Chris Ball
commit 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 upstream. If pci_ioremap_bar() fails during probe, we "goto release;" and free the host, but then we return 0 -- which tells sdhci_pci_probe() that the probe succeeded. Since we think the probe succeeded, when we unload sdhci we'll go to sdhci_pci_remove_slot() and it will try to dereference slot->host, which is now NULL because we freed it in the error path earlier. The patch simply sets ret appropriately, so that sdhci_pci_probe() will detect the failure immediately and bail out. Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-09mmc: fix a race between card-detect rescan and clock-gate work instancesGuennadi Liakhovetski
commit 26fc8775b51484d8c0a671198639c6d5ae60533e upstream. Currently there is a race in the MMC core between a card-detect rescan work and the clock-gating work, scheduled from a command completion. Fix it by removing the dedicated clock-gating mutex and using the MMC standard locking mechanism instead. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Simon Horman <horms@verge.net.au> Cc: Magnus Damm <damm@opensource.se> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-05mmc: mmci: Add ARM variant with extended FIFOPawel Moll
New IO FPGA implementation for Versatile Express boards contain MMCI (PL180) cell with FIFO extended to 128 words (512 bytes). Matt Waddel reports that this patch improves MMC performance on his vexpress system, and also fixes "mmcblk0: error -5 transferring data" errors. Signed-off-by: Pawel Moll <pawel.moll@arm.com> Tested-by: Matt Waddel <matt.waddel@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org> (cherry picked from commit 768fbc1876b3239f4c463c00ea1e78725554cf21)
2011-05-04SDIO: Add workaround for client with broken CMD53Philippe Langlais
Adds a workaround which can be turned on for SDIO devices that do not support 512 byte requests in byte mode during CMD53. These requests will always be sent in block mode instead. ST-Ericsson ID: AP272999 Change-Id: I9923e87d2be43e0139af6648f3add522d65ab5ad Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/15092 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-04MMCI: Add support for non-power-of-two block sizesPhilippe Langlais
Adds support for any block size over SDIO. ST-Ericsson ID: AP272999 Change-Id: I5a2654360a2d38e6ab929b099c2bc04668ae9e85 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/15091 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-04mmci: Fix warning introduced in previous commitPhilippe Langlais
2011-05-04MMCI: Safe check pio RW in case of spurious IRQsStefan Nilsson XK
After seeing IRQ:s coming in to indicate TXFIFO empty even when status register indicates that TXFIFO is not empty, a safer approach is now taken. ST-Ericsson ID: ER280840 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Idb2f26c83ce488237c264577c99e0dac3f378f3a Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12505 Reviewed-by: Mikael GULLBERG <mikael.xx.gullberg@stericsson.com> Tested-by: Mikael GULLBERG <mikael.xx.gullberg@stericsson.com> Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
2011-05-04MMCI: Fixup sg buffer handling in pio_writePhilippe Langlais
Earlier code in pio_write was expecting that each scattergather buffer was 4-bytes aligned which is not the case. This patch fix the problem by using a 4 bytes buffer to cache unaligned data between each pio_write operation. Change-Id: I2e506ec1f5a7fadf9780c18d8d31573eaf048273 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13860 Reviewed-by: QATOOLS Tested-by: Henrik CARLING <henrik.carling@stericsson.com> Reviewed-by: Henrik CARLING <henrik.carling@stericsson.com>
2011-05-04MMCI: Add SDIO irq support (FIXME partial merge, TODO dynamic clocking ↵Philippe Langlais
managment) SDIO irq support. The SDIO mode enable bit in the DATACTRL register together with SDIO interrupt mask are set to be able to generate SDIO interrupts from the DAT1 line. In sleep mode, SDIO interrupts are not handled and thus not being generated. Returning from sleep mode turns on SDIO interrupt handling again. ST-Ericsson ID: 319566 Change-Id: Ib919ad7b38dc999f5fa613f2c679ba9a9970c715 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12912 Conflicts: drivers/mmc/host/mmci.c
2011-05-04MMCI: Add DDR supportPhilippe Langlais
This adds support for eMMC DDR. ST-Ericsson ID: 255732 ST-Ericsson FOSS-OUT ID: NA Change-Id: If5007f81090c229dfe1d442eeffc046aa06e7014 Signed-off-by: Mikael Larsson <mikael.xt.larsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11224 Reviewed-by: QATOOLS Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-05-04MMCI: Put power register deviations in variant data.Sebastian Rasmussen
Use variant data to store hardware controller deviations concerning power registers to improve readability of the code. ST-Ericsson ID: ER282562 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I6285df49bc4dceb443df5af618ee980b0e62f59f Signed-off-by: Sebastian Rasmussen <sebastian.rasmussen@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12543 Reviewed-by: QATOOLS Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-05-04MMCI: Fix incorrect handling of HW FC for SDIOPhilippe Langlais
For SDIO writes smaller than 8 bytes (only SDIO case), hardware flow control was turned off, but was never turned on again which meant that if a large read request followed, SDIO would randomly give buffer overrun errors since there was no flow control. ST-Ericsson ID: ER280840 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie95323361ab3d3c19649ea5901f75127251d5432 Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9447 Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10931 Reviewed-by: QATOOLS Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11204
2011-05-03mmci: force negative edge on clock bypass for ux500Linus Walleij
This fixes a regression on high clock speeds with the MMCI on ux500. We need to make sure we derive the passthru clock on the falling edge of the incoming clock if it shall work at high frequencies, and on the ux500's there is a special bit for this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2011-05-03mmci: separate out ST Micro register definesLinus Walleij
The mmci.h header contained a few registers not clearly marked as ST Micro only, rectify this and remove the HWFC magic in the process. The idea is to make the mmci.h header file more ordered so other vendors with PL180 derivates can see where to put in their custom register defines. Includes portions of an earlier patch from Sebastian Rasmussen. Acked-by: Sebastian Rasmussen <sebastian.rasmussen@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2011-03-28driver-core: remove conditionals around devicetree pointersGrant Likely
Having conditional around the of_match_table and the of_node pointers turns out to make driver code use ugly #ifdef blocks. Drop the conditionals and remove the #ifdef blocks from the affected drivers. Also tidy up minor whitespace issues within the same hunks. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-25tmio: Silence warnings introduced by mfd changesAndres Salomon
This silences warnings such as drivers/video/tmiofb.c: In function 'tmiofb_hw_init': drivers/video/tmiofb.c:270: warning: initialization discards qualifiers from pointer target type These were added by me in commit 2a79bb1d. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> (cherry picked from commit 944dc03551f6e812c00e586edba84b28c52ffe8c)
2011-03-25mmc: Use mfd_data instead of driver_data for tmio-mmcAndres Salomon
Use mfd_data for passing information from mfd drivers to mfd clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). This changes tmio-mmc only; mfd drivers with other cells are not modified. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> (cherry picked from commit 4f95bf404870cccb08ff6d59e1986d43aee5efb6)
2011-03-25mfd: mfd_cell is now implicitly available to asic3 driversAndres Salomon
No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> (cherry picked from commit d24f36d352bb9fb72b6611bdca41adbb41cb13ba)
2011-03-25Merge commit 'c07946a' (mmc) into linaro-2.6.38Nicolas Pitre
2011-03-25Merge commit '05f6894' (omap-for-linus) into linaro-2.6.38Nicolas Pitre
Conflicts: arch/arm/mach-omap2/board-omap3evm.c arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/usb-musb.c arch/arm/plat-omap/include/plat/usb.h drivers/usb/musb/musb_core.h
2011-03-25Merge commit '92c260f' (msm) into linaro-2.6.38Nicolas Pitre
2011-03-25Merge commit '9c9585e' (rmk/drivers) into linaro-2.6.38Nicolas Pitre
2011-03-23mmc: sdio: remember new card RCA when redetecting cardStefan Nilsson XK
commit 0aab3995485b8a994bf29a995a008c9ea4a28054 upstream. During redetection of a SDIO card, a request for a new card RCA was submitted to the card, but was then overwritten by the old RCA. This caused the card to be deselected instead of selected when using the incorrect RCA. This bug's been present since the "oldcard" handling was introduced in 2.6.32. Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-by: Pawel Wieczorkiewicz <pawel.wieczorkiewicz@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-23mmc: sdhci: Add Ricoh e823 PCI IDManoj Iyer
commit 5fd11c0754fa069b6aba64b65734aa2fb193552d upstream. Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-17mmc: dw_mmc: support mmc power control with regulatorJaehoon Chung
This patch adds support for power regulators. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: kyungmin Park <kyungmin.park@samsung.com> Acked-by: Will Newton <will.newton@imgtec.com> Signed-off-by: Chris Ball <cjb@laptop.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 06:51:55 +0000