Anand Gadiyar 4a3dc6ef34 mmc: omap_hsmmc: fix ocr mask usage ... The OMAP HSMMC driver uses an ocr_mask to determine the list of voltages supported by the card. It populates this mask based on the list of voltages supported by the regulator that supplies the voltage. Commit 64be97822b (omap4 hsmmc: Update ocr mask for MMC2 for regulator to use) passed a fixed ocr_mask from the OMAP4 SDP board file to limit the voltage to 2.9-3.0 Volts, and updated the driver to use this mask if provided, instead of using the regulator's supported voltages. However the commit is buggy - the ocr_mask is overridden by the regulator's capabilities anyway. Fix this. (The bug shows up when a system-wide suspend is attempted on the OMAP4 SDP/Blaze platforms. The eMMC card comes up at 3V, but drops to 1.65V after the system resumes). Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Acked-by: Balaji T K <balajitk@ti.com> Acked-by: Venkatraman S <svenkatr@ti.com> Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Chris Ball <cjb@laptop.org>		2011-06-25 18:50:17 -04:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-05-29 11:19:16 -07:00
amba	ARM: 6829/1: amba: make hardcoded periphid override hardware	2011-05-26 10:33:34 +01:00
ata	libata: fix unexpectedly frozen port after ata_eh_reset()	2011-06-07 15:55:55 -04:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
auxdisplay
base	PM / Runtime: Fix loops in pm_runtime_clk_notify()	2011-06-07 23:34:58 +02:00
bcma	drivers/bcma/host_pci.c needs slab.h	2011-05-26 17:12:32 -07:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2011-06-04 08:11:26 +09:00
bluetooth	Revert "tty: make receive_buf() return the amout of bytes received"	2011-06-04 06:33:24 +09:00
cdrom	block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal	2011-06-02 05:29:19 +09:00
char	drivers/char/hpet.c: fix periodic-emulation for delayed interrupts	2011-06-15 20:04:02 -07:00
clk
clocksource	Revert "clocksource: sh_cmt: Runtime PM support"	2011-05-31 15:26:42 +09:00
connector
cpufreq	[CPUFREQ] powernow-k8: Don't try to transition if the pstate is incorrect	2011-06-16 16:31:13 -04:00
cpuidle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2011-05-29 11:18:09 -07:00
crypto	[S390] ap: skip device registration on type probe failure	2011-05-23 10:24:29 +02:00
dca
dio
dma	dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix	2011-06-14 15:03:07 +09:00
edac	edac,rcu: use synchronize_rcu() instead of call_rcu()+rcu_barrier()	2011-05-26 17:12:37 -07:00
eisa
firewire
firmware	iscsi_ibft: iscsi_ibft_find unused variable i	2011-06-09 09:05:12 -04:00
gpio	gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.	2011-06-16 08:40:43 -06:00
gpu	drm/i915: Fix gen6 (SNB) missed BLT ring interrupts.	2011-06-18 08:25:16 +10:00
hid	Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"	2011-06-16 12:21:34 +02:00
hwmon	hwmon: (max6642): Better chip detection schema	2011-06-04 10:34:28 -07:00
hwspinlock
i2c	mfd: Use mfd cell platform_data for timberdale cells platform bits	2011-05-26 19:45:05 +02:00
ide	ide-cd: signedness warning fix again	2011-06-11 15:06:48 -07:00
idle
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
input	Revert "tty: make receive_buf() return the amout of bytes received"	2011-06-04 06:33:24 +09:00
isdn	ISDN, hfcsusb: Don't leak in hfcsusb_ph_info()	2011-06-11 18:59:07 -07:00
leds	leds: fix the incorrect display in menuconfig	2011-06-15 20:04:01 -07:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mca
md	md/raid5: remove unusual use of bio_iovec_idx()	2011-06-14 14:23:57 +10:00
media	Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-06-09 13:09:07 -07:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mfd	mfd: Fix build breakage caused by tps65910 gpio directory move	2011-05-28 08:38:55 +02:00
misc	drivers/misc/apds990x.c: apds990x_chip_on() should depend on CONFIG_PM || CONFIG_PM_RUNTIME	2011-06-15 20:04:02 -07:00
mmc	mmc: omap_hsmmc: fix ocr mask usage	2011-06-25 18:50:17 -04:00
mtd	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
net	net: ep93xx_eth: fix DMA API violations	2011-06-11 16:25:16 -07:00
nfc
nubus
of	Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable	2011-05-25 00:08:17 +01:00
oprofile	oprofile: Fix locking dependency in sync_start()	2011-05-31 16:33:34 +02:00
parisc
parport	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-26 13:19:00 -07:00
pci	mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader	2011-06-18 22:18:18 -04:00
pcmcia	gpio: include linux/gpio.h where needed	2011-06-16 08:40:44 -06:00
platform	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86	2011-05-29 11:44:33 -07:00
pnp
power	Merge git://git.infradead.org/battery-2.6	2011-05-27 10:12:35 -07:00
pps
ps3
ptp	ptp: Fix some locking bugs in ptp_read()	2011-06-01 19:29:10 -07:00
rapidio
regulator	regulator: Fix _regulator_get_voltage if get_voltage callback is NULL	2011-05-27 10:49:30 +01:00
rtc	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-06-13 10:47:04 -07:00
s390	[S390] qdio: Split SBAL entry flags	2011-06-06 14:14:56 +02:00
sbus
scsi	[SCSI] Fix oops caused by queue refcounting failure	2011-06-02 18:34:43 +09:00
sfi
sh	drivers: sh: resume enabled clocks fix	2011-06-14 15:15:25 +09:00
sn
spi	spi/bfin_spi: fix handling of default bits per word setting	2011-06-17 08:27:27 -06:00
ssb	ssb: fix PCI(e) driver regression causing oops on PCI cards	2011-06-03 14:19:49 -04:00
staging	staging: fix iio builds when IIO_RING_BUFFER is not enabled	2011-06-16 08:29:00 -07:00
target	[SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions	2011-05-24 13:03:56 -04:00
tc
telephony
thermal
tty	drivers/tty/serial/pch_uart.c: don't oops if dmi_get_system_info returns NULL	2011-06-15 20:04:02 -07:00
uio
usb	USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver	2011-06-08 13:48:30 -07:00
uwb
vhost	vhost: support event index	2011-05-30 11:14:15 +09:30
video	Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x	2011-06-16 09:45:47 -07:00
virtio	virtio: add api for delayed callbacks	2011-05-30 11:14:16 +09:30
vlynq
w1	w1: W1_MASTER_DS1WM should depend on GENERIC_HARDIRQS	2011-06-15 20:04:00 -07:00
watchdog	mfd: Use mfd cell platform_data for rdc321x cells platform bits	2011-05-26 19:45:06 +02:00
xen	Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6	2011-06-09 12:52:44 -07:00
zorro
Kconfig	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-05-28 12:35:15 -07:00