kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MMC core:

Browse source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAl2AoMoXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCmS3RAApQED5OPq4Y5CZ++9XsfcUjpm
 Fz11yJQy5eAd+owwcW8pt0Htwo0+VLo/8BJ6Trc6QcPDSLEf8UvgDJweGw0D+FQV
 UJ3O//osPURLyFk7CnkneD4lpD0NqMHdre/h66JjUcbFij7k9Yly1NYokosNvJTU
 9MBTg/4hWEJPqxGpgowBiJtuqbrKsLo0yXeg5/Im+ONsefUfKE8UokwCTt/aYNIA
 QdkpeU7CsCzpt/RZlO7lQiLmc2LQhnICYUEK+hD+AA0q1yvIOLKy7uTSIPnVGpD5
 mAMBMwiJbKCwtgsWOoJ+q45xPXkV+z7ipAZ+6RK7JyHK1pMorWP0Yax3TWkc38hf
 A3N5QO93NyH3vL2O0/suNNXcrA3ZViY/+/lNfN4aXbH6TQekaQ7+oEM+vDYDUyZS
 NOXgeInZVRYOt77Y3CHpZFEbPGc7IzYrERvMY6yyH1i7Yj0097eBuM6nvd6hSveO
 XgVq+A3J7LQjuftH9L/+8i944nyrViSBWAuI7eg9QGaBZojmfMAFsyV1h/v8WHxl
 7o6NY8VssReWnU4n4ng/+HLqYGned/TbGYtG7RqAXP0Aygn18LQcX+6OfKRsKFDb
 of4WDdUwMIHb3IxyjuXYx+suE/JwQQWIx88lFmh7twagOvGAcJ7FUyS6R5jNlep/
 De98NukJgY4WU/D6Dgs=
 =p24A
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

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()
  ...
This commit is contained in:
Linus Torvalds 2019-09-17 17:27:33 -07:00
commit ea982ba7f7
43 changed files with 963 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/linux/mmc/host.h
View file

@ -128,6 +128,7 @@ struct mmc_host_ops {
int (*get_cd)(struct mmc_host *host);
void (*enable_sdio_irq)(struct mmc_host *host, int enable);
/* Mandatory callback when using MMC_CAP2_SDIO_IRQ_NOTHREAD. */
void (*ack_sdio_irq)(struct mmc_host *host);
/* optional callback for HC quirks */
@ -493,6 +494,15 @@ void mmc_command_done(struct mmc_host *host, struct mmc_request *mrq);
void mmc_cqe_request_done(struct mmc_host *host, struct mmc_request *mrq);
/*
* May be called from host driver's system/runtime suspend/resume callbacks,
* to know if SDIO IRQs has been claimed.
*/
static inline bool sdio_irq_claimed(struct mmc_host *host)
{
return host->sdio_irqs > 0;
}
static inline void mmc_signal_sdio_irq(struct mmc_host *host)
{
host->ops->enable_sdio_irq(host, 0);

2
include/linux/pci_ids.h
View file

@ -2405,6 +2405,8 @@
#define PCI_DEVICE_ID_RDC_R6061 0x6061
#define PCI_DEVICE_ID_RDC_D1010 0x1010
#define PCI_VENDOR_ID_GLI 0x17a0
#define PCI_VENDOR_ID_LENOVO 0x17aa
#define PCI_VENDOR_ID_QCOM 0x17cb