Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz

Otherwise it fails like this on cards like the Transcend 16GB SDHC card:

    mmc0: new SDHC card at address b368
    mmcblk0: mmc0:b368 SDC   15.0 GiB
    mmcblk0: error -110 sending status command, retrying
    mmcblk0: error -84 transferring data, sector 0, nr 8, cmd response 0x900, card status 0xb0

Tested on my Lenovo x200 laptop.

[bhelgaas: changelog]
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Chris Ball <cjb@laptop.org>
CC: Manoj Iyer <manoj.iyer@canonical.com>
CC: stable@vger.kernel.org
Andy Lutomirski 12 years ago
parent
c733b77475
commit
812089e01b
2 changed files with 6 additions and 2 deletions
Split View Show Diff Stats
  1. 5 2
      drivers/pci/quirks.c
  2. 1 0
      include/linux/pci_ids.h

+ 5 - 2
drivers/pci/quirks.c
View File 

@@ -2725,7 +2725,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
 
 	if (PCI_FUNC(dev->devfn))
 
 		return;
 
 	/*
 
-	 * RICOH 0xe823 SD/MMC card reader fails to recognize
 
+	 * RICOH 0xe822 and 0xe823 SD/MMC card readers fail to recognize
 
 	 * certain types of SD/MMC cards. Lowering the SD base
 
 	 * clock frequency from 200Mhz to 50Mhz fixes this issue.
 
 	 *
 
@@ -2736,7 +2736,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
 
 	 * 0xf9  - Key register for 0x150
 
 	 * 0xfc  - key register for 0xe1
 
 	 */
 
-	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
 
+	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
 
+	    dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
 
 		pci_write_config_byte(dev, 0xf9, 0xfc);
 
 		pci_write_config_byte(dev, 0x150, 0x10);
 
 		pci_write_config_byte(dev, 0xf9, 0x00);
 
@@ -2763,6 +2764,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
 
 }
 
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
 
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
 
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
 
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
 
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
 
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
 
 #endif /*CONFIG_MMC_RICOH_MMC*/

+ 1 - 0
include/linux/pci_ids.h
View File 

@@ -1568,6 +1568,7 @@
 
 #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
 
 #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
 
 #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
 
+#define PCI_DEVICE_ID_RICOH_R5CE822	0xe822
 
 #define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
 
 #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
 
 #define PCI_DEVICE_ID_RICOH_R5C843	0x0843