Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "mmc: rtsx_pci: add quirk to disable MMC_CAP_AGGRESSIVE_PM for RTS525A"
This reverts commit 5f0bf80cc5e04d31eeb201683e0b477c24bd18e7.
This was asked to be reverted as it is not the correct way to do this.
Fixes: 5f0bf80cc5e0 ("mmc: rtsx_pci: add quirk to disable MMC_CAP_AGGRESSIVE_PM for RTS525A")
Cc: Matthew Schwartz <matthew.schwartz@linux.dev>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+2
-6
-3
drivers/misc/cardreader/rts5249.c
-3
drivers/misc/cardreader/rts5249.c
···
78
78
if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A))
79
79
pcr->rtd3_en = rtsx_reg_to_rtd3_uhsii(reg);
80
80
81
-
if (CHK_PCI_PID(pcr, PID_525A))
82
-
pcr->extra_caps |= EXTRA_CAPS_NO_AGGRESSIVE_PM;
83
-
84
81
if (rtsx_check_mmc_support(reg))
85
82
pcr->extra_caps |= EXTRA_CAPS_NO_MMC;
86
83
pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg);
+2
-2
drivers/mmc/host/rtsx_pci_sdmmc.c
+2
-2
drivers/mmc/host/rtsx_pci_sdmmc.c
···
1456
1456
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED |
1457
1457
MMC_CAP_MMC_HIGHSPEED | MMC_CAP_BUS_WIDTH_TEST |
1458
1458
MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25;
1459
-
if (pcr->rtd3_en && !(pcr->extra_caps & EXTRA_CAPS_NO_AGGRESSIVE_PM))
1460
-
mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
1459
+
if (pcr->rtd3_en)
1460
+
mmc->caps = mmc->caps | MMC_CAP_AGGRESSIVE_PM;
1461
1461
mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP | MMC_CAP2_FULL_PWR_CYCLE |
1462
1462
MMC_CAP2_NO_SDIO;
1463
1463
mmc->max_current_330 = 400;