Jarkko Lavinen
a3f406f861
omap_hsmmc: fix scatter-gather list sanity checking
...
Do not use host->dma_len when it is uninitialzed. Finish the request with
an error if the mmc_omap_prepare_data() fails.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Adrian Hunter
a6b2240da2
omap_hsmmc: ensure workqueues are empty before suspend
...
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Denis Karpov
abb28e731a
omap_hsmmc: set open drain bit correctly
...
The code could set the bit to 1 but not reset it to 0.
Signed-off-by: Denis Karpov <ext-denis.2.karpov@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Denis Karpov
11dd62a741
omap_hsmmc: context save/restore support
...
Keep the context over PM dynamic OFF states.
Signed-off-by: Denis Karpov <ext-denis.2.karpov@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Adrian Hunter
a3621465b4
omap_hsmmc: keep track of power mode
...
This patch is preparation for adding context save and restore support.
Keep track of the current power mode so that the context restore function
can avoid restoring the context for a card if the power has been switched
off. If the power is off, the card must be reinitialized anyway which
will re-establish the context.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Adrian Hunter
5e2ea6173d
omap_hsmmc: make use of new enable/disable interface
...
For the moment enable / disable just turns the fclk on and off.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Denis Karpov
d900f7128c
omap_hsmmc: add debugfs entry (host registers)
...
Adds <debugfs_root>/kernel/debug/mmc<N>/regs entry, contents show
registers' state and some driver internal state variables.
Signed-off-by: Denis Karpov <ext-denis.2.karpov@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Adrian Hunter
ef0b27d4cc
mmc: check status after MMC SWITCH command
...
According to the standard, the SWITCH command should be followed by a
SEND_STATUS command to check for errors.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Denis Karpov
53509f0fe2
mmc: power off once at removal
...
Fix MMC host stop sequence: power off once.
Signed-off-by: Denis Karpov <ext-denis.2.karpov@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:34 -07:00
Jarkko Lavinen
b1ebe38456
mmc: add mmc card sleep and awake support
...
Add support for the new MMC command SLEEP_AWAKE.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Adrian Hunter
eae1aeeed8
mmc: add ability to save power by powering off cards
...
Power can be saved by powering off cards that are not in use. This is
similar to suspend / resume except it is under the control of the driver,
and does not require any power management support. It can only be used
when the driver can monitor whether the card is removed, otherwise it is
unsafe. This is possible because, unlike suspend, the driver still
receives card detect and / or cover switch interrupts.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Adrian Hunter
9feae24696
mmc: add MMC_CAP_NONREMOVABLE host capability
...
eMMC's are not removable, so unsafe resume is OK always.
To permit this a new host capability MMC_CAP_NONREMOVABLE has been added
and suspend / resume updated accordingly.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Adrian Hunter
319a3f1429
mmc: allow host claim / release nesting
...
This change allows the MMC host to be claimed in situations where the host
may or may not have already been claimed. Also 'mmc_try_claim_host()' is
now exported.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Adrian Hunter
8ea926b22e
mmc: add 'enable' and 'disable' methods to mmc host
...
MMC hosts that support power saving can use the 'enable' and 'disable'
methods to exit and enter power saving states. An explanation of their
use is provided in the comments added to include/linux/mmc/host.h.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Philip Langdale <philipl@overt.org >
Cc: "Madhusudhan" <madhu.cr@ti.com >
Cc: <linux-mmc@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Ohad Ben-Cohen
27cce39f55
sdio: do not ignore MMC_VDD_165_195
...
This is needed for 1.8V embedded SDIO devices and supporting host controllers
(e.g. TI 127x and ZOOM2 boards)
Signed-off-by: Ohad Ben-Cohen <ohad@bencohen.org >
Acked-by: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: Pierre Ossman <pierre@ossman.eu >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Uwe Kleine-König
f400cd8c84
mmc: register mmci-omap-hs using platform_driver_probe
...
omap_mmc_probe lives in .init.text, so using platform_driver_register to
register it is wrong because binding a device after the init memory is
discarded (e.g. via sysfs) results in an oops.
As requested by David Brownell platform_driver_probe is used instead of
moving the probe function to .devinit.text as proposed initially. This
saves some memory, but devices registered after the driver is probed are
not bound (probably there are none) and binding via sysfs isn't possible.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Cc: Jean Pihet <jpihet@mvista.com >
Cc: Tony Lindgren <tony@atomide.com >
Cc: Pierre Ossman <drzeus@drzeus.cx >
Cc: Andy Lowe <alowe@mvista.com >
Cc: Adrian Hunter <ext-adrian.hunter@nokia.com >
Cc: Andrew Morton <akpm@linux-foundation.org >
Acked-by: David Brownell <dbrownell@users.sourceforge.net >
Cc: Madhusudhan Chikkature<madhu.cr@ti.com >
Cc: Greg Kroah-Hartman <gregkh@suse.de >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Joe Perches
b5a74d6058
msm_sdcc.c: move overly indented code to separate function
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Pavel Machek <pavel@ucw.cz >
Cc: Brian Swetland <swetland@google.com >
Cc: Pierre Ossman <drzeus-list@drzeus.cx >
Cc: San Mehat <san@android.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Joe Perches
75d145283b
msm_sdcc.c: stylistic cleaning
...
Make it a bit more like typical kernel style.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Pavel Machek <pavel@ucw.cz >
Cc: Brian Swetland <swetland@google.com >
Cc: Pierre Ossman <drzeus-list@drzeus.cx >
Cc: San Mehat <san@android.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
Joe Perches
0a7ff7c757
msm_sdcc.c: convert printk(KERN_<level> to pr_<level>(
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Pavel Machek <pavel@ucw.cz >
Cc: Brian Swetland <swetland@google.com >
Cc: Pierre Ossman <drzeus-list@drzeus.cx >
Cc: San Mehat <san@android.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:33 -07:00
San Mehat
9d2bd7383c
mmc: msm_sdccc: driver for HTC Dream
...
MMC Driver for HTC Dream. I picked the code up from Google git trees,
removed stuff not strictly necessary, and did a few cleanups. It still
works :-).
Signed-off-by: Pavel Machek <pavel@ucw.cz >
Cc: Brian Swetland <swetland@google.com >
Cc: Pierre Ossman <drzeus-list@drzeus.cx >
Cc: Joe Perches <joe@perches.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:32 -07:00
Anand Gadiyar
ccdfe3a66a
OMAP: HSMMC: do not enable buffer ready interrupt if using DMA
...
This considerably reduces the number of interrupts during a transfer
and ought to result in some power saving.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com >
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com >
Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com >
Cc: Pierre Ossman <drzeus@drzeus.cx >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:32 -07:00
Balaji Rao
500f35648e
mmc: in mmc_power_up(), use previously selected ocr if available
...
When mmc_power_up is called during unsafe resume, host->ocr should be used
instead of host->ocr_avail.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org >
Cc: Andy Green <andy@openmoko.com >
Cc: Pierre Ossman <drzeus-mmc@drzeus.cx >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Acked-by: Matt Fleming <matt@console-pimps.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-23 07:39:32 -07:00
Linus Torvalds
342ff1a1b5
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
2009-09-22 07:51:45 -07:00
Alexey Dobriyan
83d5cde47d
const: make block_device_operations const
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-09-22 07:17:25 -07:00
Anand Gadiyar
fd589a8f0a
trivial: fix typo "to to" in multiple files
...
Signed-off-by: Anand Gadiyar <gadiyar@ti.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2009-09-21 15:14:55 +02:00
David Brownell
a4dbd6740d
driver model: constify attribute groups
...
Let attribute group vectors be declared "const". We'd
like to let most attribute metadata live in read-only
sections... this is a start.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net >
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de >
2009-09-15 09:50:47 -07:00
Russell King
87d721ad7a
Merge branch 'master' into devel
2009-09-12 12:04:37 +01:00
Russell King
ddd559b13f
Merge branch 'devel-stable' into devel
...
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
2009-09-12 12:02:26 +01:00
Russell King
cf7a2b4fb6
Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel
2009-09-12 12:01:34 +01:00
Linus Walleij
f17a1f06d2
ARM: 5636/1: Move vendor enum to AMBA include
...
This moves the primecell vendor enum definition inside vic.c
out to linux/amba/bus.h where it belongs and replace any
occurances of specific vendor ID:s with the respective enums
instead.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-09-12 11:51:14 +01:00
Linus Walleij
7064d2092d
ARM: 5685/1: Make MMCI driver compile without gpiolib
...
The recent addition of optional gpiolib support to check if a
card was inserted or write protected was really not optional.
It needs this ifdef to become optional so that U300 compiles,
for example.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-09-02 11:21:14 +01:00
Julia Lawall
2198a64a74
drivers/mmc: correct error-handling code
...
sdhci_alloc_host returns an ERR_PTR value in an error case instead of NULL.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/ )
// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@
x = sdhci_alloc_host(...)
... when != x = E
(
* if (x == NULL || ...) S1 else S2
|
* if (x == NULL && ...) S1 else S2
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk >
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Philip Langdale <philipl@overt.org >
Cc: Pierre Ossman <pierre@ossman.eu >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-08-07 10:39:56 -07:00
Joe Perches
a9239d750d
imxmmc: Remove unnecessary semicolons
...
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-07-31 12:28:46 +02:00
Sebastian Andrzej Siewior
4b2a108cd0
cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG
...
the code allready uses flush_kernel_dcache_page(). This patch updates the
driver to the recent sg API changes which require that either SG_MITER_TO_SG
or SG_MITER_FROM_SG is set. SG_MITER_TO_SG calls flush_kernel_dcache_page()
in sg_mitter_stop()
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc >
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-07-31 12:28:46 +02:00
Sebastian Andrzej Siewior
da60a91d01
sdhci: use SG_MITER_TO_SG/SG_MITER_FROM_SG
...
so the page will be flushed on unmap on ARCH which need it.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-07-31 12:28:45 +02:00
Anton Vorontsov
a9e58f2573
sdhci: get rid of "frequency too high" flood when using eSDHC
...
Since commit 8dfd0374be ("MMC core: limit
minimum initialization frequency to 400kHz") MMC core checks for minimum
frequency, and that causes following messages flood when using eSDHC
controllers:
...
mmc0: Minimum clock frequency too high for identification mode
mmc0: Minimum clock frequency too high for identification mode
...
The warnings are legitimate, since if we'd use 133 MHz clocks for standard
SDHCI controllers, we'd not able to scale frequency down to 400 kHz.
But eSDHC controllers have a non-standard SD clock management, so we can
divide clock by 256 * 16, not just 256.
This patch introduces get_min_clock() callback for sdhci core and
implements it for sdhci-of driver, and thus fixes the issue.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com >
Cc: Matt Fleming <matt@console-pimps.org >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com >
Cc: Pierre Ossman <drzeus@drzeus.cx >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:36 -07:00
Nicolas Pitre
6cdbf73449
mvsdio: fix handling of partial word at the end of PIO transfer
...
Standard data flow for MMC/SD/SDIO cards requires that the mvsdio
controller be set for big endian operation. This is causing problems
with buffers which length is not a multiple of 4 bytes as the last
partial word doesn't get shifted all the way and stored properly in
memory. Let's compensate for this.
Signed-off-by: Nicolas Pitre <nico@marvell.com >
CC: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-20 16:46:34 -07:00
Russell King
4e66a0f536
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
2009-07-09 16:07:22 +01:00
Russell King
8900144692
MMC: MMCI: use gpiolib for card detect/write protect
...
Use gpiolib where available (and when valid GPIOs are provided) for
write protect/card detect status reporting. We fall back to the old
'status' method where gpiolib support is not available.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-07-09 15:16:07 +01:00
Russell King
012b7d339c
MMC: MMCI: use AMBA bus accessors
...
Rather than open coding the accessors for decoding peripheral IDs,
use the macros already provided.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
Acked-by: Linus Walleij <linus.walleij@stericsson.com >
2009-07-09 15:13:56 +01:00
Matt Reimer
7eeff48142
pxamci: correct DMA flow control
...
The DMA flow control in pxamci_setup_data() is backwards; fix it.
Signed-off-by: Matt Reimer <mreimer@sdgsystems.com >
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2009-07-03 14:13:28 +08:00
David Brownell
70d6027ff2
spi: add spi_master flag word
...
Add a new spi_master.flags word listing constraints relevant to that
controller. Define the first constraint bit: a half duplex restriction.
Include that constraint in the OMAP1 MicroWire controller driver.
Have the mmc_spi host be the first customer of this flag. Its coding
relies heavily on full duplex transfers, so it must fail when the
underlying controller driver won't perform them.
(The spi_write_then_read routine could use it too: use the
temporarily-withdrawn full-duplex speedup unless this flag is set, in
which case the existing code applies. Similarly, any spi_master
implementing only SPI_3WIRE should set the flag.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net >
Cc: Marek Szyprowski <m.szyprowski@samsung.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-06-30 18:56:00 -07:00
Pierre Ossman
11a2f1b78a
sdhci: remove needless double parenthesis
...
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:01:00 +02:00
Harald Welte
557b06971b
sdhci: Specific quirk vor VIA SDHCI controller in VX855ES
...
The SDHCI controller found in the VX855ES requires 10ms
delay between applying power and applying clock.
This issue has been discovered and documented by the OLPC XO1.5 team.
Signed-off-by: Harald Welte <HaraldWelte@viatech.com >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:59 +02:00
Ben Dooks
fe9db6cbf1
s3cmci: fix dma configuration call
...
This was missed in the DMA changes during the s3c24xx
updates in commit 8970ef47d5 .
Signed-off-by: Ben Dooks <ben@simtec.co.uk >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:59 +02:00
Harald Welte
f0bf7f61b8
mmc: Add new via-sdmmc host controller driver
...
This adds the via-sdmmc driver for the SD/MMC-controller of VIA,
which is found in a number of recent integrated VIA chipset
products.
Signed-off-by: Harald Welte <HaraldWelte@viatech.com >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:59 +02:00
Anton Vorontsov
5fe23c7f51
sdhci: Add support for hosts that are only capable of 1-bit transfers
...
Some hosts (hardware configurations, or particular SD/MMC slots) may
not support 4-bit bus. For example, on MPC8569E-MDS boards we can
switch between serial (1-bit only) and nibble (4-bit) modes, thought
we have to disable more peripherals to work in 4-bit mode.
Along with some small core changes, this patch modifies sdhci-of
driver, so that now it looks for "sdhci,1-bit-only" property in the
device-tree, and if specified we enable a proper quirk.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com >
Acked-by: Grant Likely <grant.likely@secretlab.ca >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:59 +02:00
Ben Dooks
1388eefd5a
sdhci: Add SDHCI_QUIRK_NO_MULTIBLOCK quirk
...
Add quirk to show the controller cannot do multi-block IO.
This is mainly for the Samsung SDHCI controller that currently
cannot manage to do multi-block PIO without timing out.
Signed-off-by: Ben Dooks <ben@simtec.co.uk >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:58 +02:00
Ben Dooks
6882a8c071
sdhci: Add better ADMA error reporting
...
Update the ADMA error reporting to not only show the
overall controller state but also to print the ADMA
descriptor list.
Signed-off-by: Ben Dooks <ben@simtec.co.uk >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:58 +02:00
Ben Dooks
0d1bb41ad4
sdhci-s3c: Samsung S3C based SDHCI controller glue
...
Add support for the 'HSMMC' block(s) in the Samsung SoC
line. These are compatible with the SDHCI driver so add
the necessary setup and driver binding for the platform
devices.
Signed-off-by: Ben Dooks <ben@simtec.co.uk >
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-06-21 21:00:57 +02:00