Pull MMC updates from Ulf Hansson: "MMC core: - Fixup processing of SDIO IRQs during system suspend/resume - Add helper function to indicate if SDIO IRQs is enabled MMC host: - bcm2835: Take SWIOTLB memory size limitation into account - dw_mmc: Improve SDIO IRQs support - mtk-sd: Various improvements - mtk-sd: Improve SDIO IRQs support - sdhci-iproc: Add support for emmc2 of the BCM2711 - sdhci-of-arasan: Add Support for Intel LGM eMMC - sdhci-of-aspeed: Add support for the ASPEED SD controller - sdhci-of-esdhc: Deal with erratum A011334 support in ls1028a 1.0 SoC - sdhci-pci: Prepare to add support of Genesys Logic GL975x - sdhci-pci: Add another Id for Intel CML - sdhci-pci-o2micro: Fix O2 Host data read/write DLL Lock phase shift issue - sunxi: Add support for H5 compatibles" * tag 'mmc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (59 commits) ms_block: fix spelling mistake "randomally" -> "randomly" mmc: dw_mmc: hi3798cv200: make array degrees static const, makes object smaller mmc: sdhci: Convert to use sdio_irq_claimed() mmc: sdhci: Drop redundant code for SDIO IRQs mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq() mmc: core: Fixup processing of SDIO IRQs during system suspend/resume mmc: core: WARN if SDIO IRQs are enabled for non-powered card in suspend mmc: core: Clarify that the ->ack_sdio_irq() callback is mandatory mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD mmc: core: Move code to get pending SDIO IRQs to a function mmc: mtk-sd: Re-store SDIO IRQs mask at system resume mmc: dw_mmc: Re-store SDIO IRQs mask at system resume mmc: core: Add helper function to indicate if SDIO IRQs is enabled mmc: sdhci-pci-o2micro: Fix O2 Host data read/write DLL Lock phase shift issue mmc: sdhci-pci-o2micro: Move functions in preparation to fix DLL lock phase shift issue mmc: sdhci-pci-o2micro: Change O2 Host PLL and DLL register name mmc: sdhci: Fix incorrect switch to HS mode mmc: sdhci-of-aspeed: Depend on CONFIG_OF_ADDRESS mmc: sdhci-of-aspeed: Allow max-frequency limitation of SDCLK mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock() ...
Showing the changes to include/linux (2 of 43 files). Show all
Unified · Split
| @@ -128,6 +128,7 @@ struct mmc_host_ops { · 127 unmodified lines | |||
| 128 | int (*get_cd)(struct mmc_host *host); | 128 | int (*get_cd)(struct mmc_host *host); |
| 129 | 129 | ||
| 130 | void (*enable_sdio_irq)(struct mmc_host *host, int enable); | 130 | void (*enable_sdio_irq)(struct mmc_host *host, int enable); |
| 131 | /* Mandatory callback when using MMC_CAP2_SDIO_IRQ_NOTHREAD. */ | ||
| 131 | void (*ack_sdio_irq)(struct mmc_host *host); | 132 | void (*ack_sdio_irq)(struct mmc_host *host); |
| 132 | 133 | ||
| 133 | /* optional callback for HC quirks */ | 134 | /* optional callback for HC quirks */ |
| @@ -493,6 +494,15 @@ void mmc_command_done(struct mmc_host *host, struct mmc_request *mrq); · 359 unmodified lines | |||
| 493 | 494 | ||
| 494 | void mmc_cqe_request_done(struct mmc_host *host, struct mmc_request *mrq); | 495 | void mmc_cqe_request_done(struct mmc_host *host, struct mmc_request *mrq); |
| 495 | 496 | ||
| 497 | /* | ||
| 498 | * May be called from host driver's system/runtime suspend/resume callbacks, | ||
| 499 | * to know if SDIO IRQs has been claimed. | ||
| 500 | */ | ||
| 501 | static inline bool sdio_irq_claimed(struct mmc_host *host) | ||
| 502 | { | ||
| 503 | return host->sdio_irqs > 0; | ||
| 504 | } | ||
| 505 | |||
| 496 | static inline void mmc_signal_sdio_irq(struct mmc_host *host) | 506 | static inline void mmc_signal_sdio_irq(struct mmc_host *host) |
| 497 | { | 507 | { |
| 498 | host->ops->enable_sdio_irq(host, 0); | 508 | host->ops->enable_sdio_irq(host, 0); |
| @@ -2405,6 +2405,8 @@ · 2404 unmodified lines | |||
| 2405 | #define PCI_DEVICE_ID_RDC_R6061 0x6061 | 2405 | #define PCI_DEVICE_ID_RDC_R6061 0x6061 |
| 2406 | #define PCI_DEVICE_ID_RDC_D1010 0x1010 | 2406 | #define PCI_DEVICE_ID_RDC_D1010 0x1010 |
| 2407 | 2407 | ||
| 2408 | #define PCI_VENDOR_ID_GLI 0x17a0 | ||
| 2409 | |||
| 2408 | #define PCI_VENDOR_ID_LENOVO 0x17aa | 2410 | #define PCI_VENDOR_ID_LENOVO 0x17aa |
| 2409 | 2411 | ||
| 2410 | #define PCI_VENDOR_ID_QCOM 0x17cb | 2412 | #define PCI_VENDOR_ID_QCOM 0x17cb |