aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-27sdhci: build fix: rename SDHCI I/O accessor functionsMatt Fleming3-30/+30
Unfortunately some architectures #define their read{b,w,l} and write{b,w,l} I/O accessors which makes the SDHCI I/O accessor functions of the same names subject to preprocessing. This leads to the following compiler error, In file included from drivers/mmc/host/sdhci.c:26: drivers/mmc/host/sdhci.h:318:35: error: macro "writel" passed 3 arguments, but takes just 2 Rename the SDHCI I/O functions so that CONFIG_MMC_SDHCI_IO_ACCESSORS can be enabled for architectures that implement their read{b,w,l} and write{b,w,l} functions with macros. Signed-off-by: Matt Fleming <[email protected]> Cc: Zhangfei Gao <[email protected]> Acked-by: Anton Vorontsov <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc: SDHCI_INT_DATA_MASK typo errorZhangfei Gao1-1/+1
Signed-off-by: Zhangfei Gao <[email protected]> Reviewed-by: Matt Fleming <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc: atmel-mci: Add support for SDIO interruptsAnders Grahn1-4/+38
Atmel-mci support for SDIO interrupts. This adds the enable_sdio_irq() function and the configuration of sdio irq mask per slot. With this irq mask information, we keep the idea of multiple slot per sd/mmc host (not only A and B). MMC_CAP_SDIO_IRQ is added according to slot configuration. A new little function is added to run mmc_signal_sdio_irq() during interrupt handling routine. Signed-off-by: Anders Grahn <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Cc: Haavard Skinnemoen <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc: add support MMCIF for SuperHYusuke Goda4-0/+1013
MMCIF is the MMC Host Interface in SuperH. Signed-off-by: Yusuke Goda <[email protected]> Cc: Ben Hutchings <[email protected]> Cc: Paul Mundt <[email protected]> Cc: Magnus Damm <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc: atmel-mci: enable SD high speed supportNicolas Ferre1-3/+19
Enable high speed support for atmel-mci driver. This support is dependent of the revision of the IP and, of course, the capacity of the SD card used. Signed-off-by: Nicolas Ferre <[email protected]> Reviewed-by: Haavard Skinnemoen <[email protected]> Cc: Maciej Sosnowski <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc: sd: clean up redundant memsetMark Asselstine1-2/+0
The clearing of mrq via a memset at the top of the for loop in mmc_wait_for_app_cmd() is not required as mrq is not used and there is another clearing of mrq just below. We remove the first memset since if the initial tests in the for loop fail the memset is not required. Signed-off-by: Mark Asselstine <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27davinci: mmc: updates to suspend/resume implementationChaithrika U S1-8/+43
Improve the suspend and resume callbacks in DaVinci MMC host controller driver. Modify the reset status of the contorller and clock during suspend and resume. Also migrate the power management callbacks from platform driver to dev_pm_ops structure. Tested on DA850/OMAP-L138 EVM. [[email protected]: coding-style fixes] Signed-off-by: Chaithrika U S <[email protected]> Acked-by: Kevin Hilman <[email protected]> Cc: Vipin Bhandari <[email protected]> Cc: Sudhakar Rajashekhara <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27davinci: mmc: add a function to control reset state of the controllerChaithrika U S1-21/+16
Add a helper function which will aid in changing the reset status of the controller. Signed-off-by: Chaithrika U S <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Cc: Vipin Bhandari <[email protected]> Cc: Sudhakar Rajashekhara <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27sdhci-pltfm: do not print errors in case of an extended iomem sizeAnton Vorontsov1-1/+1
Some hosts have an extended SDHCI iomem size, so the driver should only print errors if the iomem size is less than 0x100. Signed-off-by: Anton Vorontsov <[email protected]> Acked-by: Richard Röjfors <[email protected]> Cc: David Vrabel <[email protected]> Cc: Pierre Ossman <[email protected]> Cc: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27sdhci-pltfm: implement platform data passingAnton Vorontsov2-4/+55
This includes platform ops, quirks and (de)initialization callbacks. Signed-off-by: Anton Vorontsov <[email protected]> Cc: Richard Röjfors <[email protected]> Cc: David Vrabel <[email protected]> Cc: Pierre Ossman <[email protected]> Cc: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27sdhci: implement CAP_CLOCK_BASE_BROKEN quirkAnton Vorontsov2-1/+4
Some hosts (e.g. as found in CNS3xxx SOCs) report wrong value in CLOCK_BASE capability field, and currently there is no way to force the SDHCI core to use the platform-provided base clock value. This patch implements CAP_CLOCK_BASE_BROKEN quirk. When enabled, the SDHCI core will always use base clock frequency provided by the platform. Signed-off-by: Anton Vorontsov <[email protected]> Cc: Richard Röjfors <[email protected]> Cc: David Vrabel <[email protected]> Cc: Pierre Ossman <[email protected]> Cc: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27mmc-omap: add support for 16-bit and 32-bit registersMarek Belisko1-29/+33
The omap850 and omap730 use 16-bit registers instead of 32-bit, requiring a modification of the register addresses in the mmc-omap driver. To resolve this, a bit shift is performed on base register addresses, either by 1 or 2 bits depending on the CPU in use. This yields the correct registers for each CPU. Signed-off-by: Marek Belisko <[email protected]> Signed-off-by: Cory Maccarrone <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Cc: Ladislav Michl <[email protected]> Cc: Ben Dooks <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27davinci: mmc: pass number of SG segments as platform dataSudhakar Rajashekhara2-7/+20
On some platforms like DM355, the number of EDMA parameter slots available for EDMA_SLOT_ANY usage are few. In such cases, if MMC/SD uses 16 slots for each instance of MMC controller, then the number of slots available for other modules will be very few. By passing the number of EDMA slots to be used in MMC driver from platform data, EDMA slots available for other purposes can be controlled. Most of the platforms will not use this platform data variable. But on DM355, as the number of EDMA resources available is limited, the number of scatter- gather segments used inside the MMC driver can be 8 (passed as platform data) instead of 16. On DM355, when the number of scatter-gather segments was reduced to 8, I saw a performance difference of about 0.25-0.4 Mbytes/sec during write. Read performance variations were negligible. Signed-off-by: Sudhakar Rajashekhara <[email protected]> Acked-by: Kevin Hilman <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-27Btrfs: add more error checking to btrfs_dirty_inodeChris Mason1-2/+13
The ENOSPC code will now return ENOSPC to btrfs_start_transaction. btrfs_dirty_inode needs to check for this and error out appropriately. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Input: usbtouchscreen - support bigger iNexio touchscreensOndrej Zary1-1/+6
Bigger Nexio touchscreens not only send more data but also the header values are modified somewhat. Fix the header (it's a guesswork but it works at least on one 46" touchscreen with 2.00SMS firmware) and also increase rept_size. Signed-off-by: Ondrej Zary <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-05-26Input: ads7846 - return error on regulator_get() failureKevin Hilman1-2/+2
In probe(), if regulator_get() failed, an error code was not being returned causing the driver to be successfully bound, even though probe failed. This in turn caused the suspend, resume and remove methods to be registered and accessed via the SPI core. Since these functions all access private driver data using pointers that had been freed during the failed probe, this would lead to unpredictable behavior. This patch ensures that probe() returns an error code in this failure case so the driver is not bound. Found using lockdep and noticing the lock used in the suspend/resum path pointed to a bogus lock due to the freed memory. Signed-off-by: Kevin Hilman <[email protected]> Acked-by: Mike Frysinger <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-05-26Btrfs: allow unaligned DIOChris Mason1-3/+35
In order to support DIO that isn't aligned to the filesystem blocksize, we fall back to buffered for any unaligned DIOs. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Btrfs: drop verbose enospc printkChris Mason1-0/+2
Less printk is good printk. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Btrfs: Fix block generation verification raceYan, Zheng1-1/+1
After the path is released, the generation number got from block pointer is no long valid. The race may cause disk corruption, because verify_parent_transid() calls clear_extent_buffer_uptodate() when generation numbers mismatch. Signed-off-by: Yan Zheng <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-05-26Btrfs: fix preallocation and nodatacow checks in O_DIRECTChris Mason1-16/+140
The O_DIRECT code wasn't checking for multiple references on preallocated or nodatacow extents. This means it wasn't honoring snapshots properly. The fix here is to add an explicit check for multiple references This also fixes the math for selecting the correct disk block, making sure not to go past the end of the extent. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Merge branch 'drm-linus' of ↵Linus Torvalds9-15/+51
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: agp: amd64, fix pci reference leaks drm/edid: Allow non-fatal checksum errors in CEA blocks drm/radeon/kms: suppress a build warning (unused variable) drm: Fixes linux-next & linux-2.6 checkstack warnings: nouveau: fix acpi_lid_open undefined drm/radeon/kms: release AGP bridge at suspend
2010-05-26m68k: amiga - RTC platform device conversionGeert Uytterhoeven2-174/+17
The A2000 TOD is an Oki MSM6242B, while the A3000 TOD is a Ricoh RP5C01. Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Parallel port platform device conversionGeert Uytterhoeven2-24/+43
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Serial port platform device conversionGeert Uytterhoeven2-26/+38
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Mouse platform device conversionGeert Uytterhoeven2-35/+66
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Keyboard platform device conversionGeert Uytterhoeven2-39/+63
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - Amiga Gayle IDE platform device conversionGeert Uytterhoeven3-66/+150
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - A4000T SCSI platform device conversionGeert Uytterhoeven2-55/+57
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Do not use legacy Scsi_Host.baseGeert Uytterhoeven1-35/+41
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - A3000 SCSI platform device conversionGeert Uytterhoeven2-64/+111
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: gvp11 - Do not use legacy Scsi_Host.baseGeert Uytterhoeven1-49/+56
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - GVP Series II SCSI zorro_driver conversionGeert Uytterhoeven2-149/+156
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a2091 - Do not use legacy Scsi_Host.baseGeert Uytterhoeven1-34/+41
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: amiga - A2091/A590 SCSI zorro_driver conversionGeert Uytterhoeven1-84/+102
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: mvme147 - Kill obsolete HOSTS_C logicGeert Uytterhoeven1-3/+0
Kill the obsolete HOSTS_C define and the related double inclusion of mvme147.h Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Kill a3000_scsiregs typedefGeert Uytterhoeven2-8/+8
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: gvp11 - Kill gvp11_scsiregs typedefGeert Uytterhoeven2-9/+9
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a2091 - Kill a2091_scsiregs typedefGeert Uytterhoeven2-8/+8
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: gvp11 - Extract check_wd33c93()Geert Uytterhoeven1-77/+83
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Kill static global a3000_hostGeert Uytterhoeven1-19/+19
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: mvme147 - Kill static global mvme147_hostGeert Uytterhoeven1-14/+16
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Kill ugly DMA() macroGeert Uytterhoeven1-19/+25
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: gvp11 - Kill ugly DMA() macroGeert Uytterhoeven1-24/+28
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: set ARCH_KMALLOC_MINALIGNFUJITA Tomonori1-0/+2
Architectures that handle DMA-non-coherent memory need to set ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is DMA-safe: the buffer doesn't share a cache with the others. Signed-off-by: FUJITA Tomonori <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Acked-by: Pekka Enberg <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: Enable atomic64_tGeert Uytterhoeven2-0/+3
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26do_generic_file_read: clear page errors when issuing a fresh read of the pageJeff Moyer1-0/+6
I/O errors can happen due to temporary failures, like multipath errors or losing network contact with the iSCSI server. Because of that, the VM will retry readpage on the page. However, do_generic_file_read does not clear PG_error. This causes the system to be unable to actually use the data in the page cache page, even if the subsequent readpage completes successfully! The function filemap_fault has had a ClearPageError before readpage forever. This patch simply adds the same to do_generic_file_read. Signed-off-by: Jeff Moyer <[email protected]> Signed-off-by: Rik van Riel <[email protected]> Acked-by: Larry Woodman <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds14-24/+723
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: squashfs: update documentation to include description of xattr layout squashfs: fix name reading in squashfs_xattr_get squashfs: constify xattr handlers squashfs: xattr fix sparse warnings squashfs: xattr_lookup sparse fix squashfs: add xattr support configure option squashfs: add new extended inode types squashfs: add support for xattr reading squashfs: add xattr id support
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds9-12/+541
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: roccat: fix build failure if built as module HID: roccat: propagate special events of roccat hardware to userspace HID: Add the GYR4101US USB ID to hid-gyration HID: fix hid-roccat-kone for bin_attr API change
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds13-102/+219
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: emu10k1: allow high-resolution mixer controls ALSA: pcm: fix delta calculation at boundary wraparound ALSA: hda_intel: fix handling of non-completion stream interrupts ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis ALSA: hda: Fix model quirk for Dell M1730 ALSA: hda - iMac9,1 sound fixes ALSA: hda: Use LPIB for Toshiba A100-259 ALSA: hda: Use LPIB for Acer Aspire 5110 ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise ALSA: usb-audio: add support for Akai MPD16 ALSA: pcm: fix the fix of the runtime->boundary calculation
2010-05-26Revert "endian: #define __BYTE_ORDER"Linus Torvalds9-8/+31
This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was also totally broken (see commit 0d2daf5cc858 that reverted the crc32 version of it). As reported by Stephen Rothwell, it causes problems on big-endian machines: > In file included from fs/jfs/jfs_types.h:33, > from fs/jfs/jfs_incore.h:26, > from fs/jfs/file.c:22: > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN" model. It's not how we do things, and it isn't how we _should_ do things. So don't go there. Requested-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.