| From 812089e01b9f65f90fc8fc670d8cce72a0e01fbb Mon Sep 17 00:00:00 2001 |
| From: Andy Lutomirski <luto@amacapital.net> |
| Date: Sat, 1 Dec 2012 12:37:20 -0800 |
| Subject: PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz |
| |
| From: Andy Lutomirski <luto@amacapital.net> |
| |
| commit 812089e01b9f65f90fc8fc670d8cce72a0e01fbb upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/quirks.c | 7 +++++-- |
| include/linux/pci_ids.h | 1 + |
| 2 files changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/pci/quirks.c |
| +++ b/drivers/pci/quirks.c |
| @@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struc |
| 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. |
| * |
| @@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struc |
| * 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); |
| @@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struc |
| } |
| 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*/ |
| --- a/include/linux/pci_ids.h |
| +++ b/include/linux/pci_ids.h |
| @@ -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 |
