Commit f7a447ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:
 "MMC core:

   - Fix CQE recovery reset success for block I/O

  MMC host:

   - sdhci-pci-gli: Fix support for runtime resume

   - Fix unevaluatedProperties warnings in DT examples"

* tag 'mmc-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  dt-bindings: mmc: Fix unevaluatedProperties warnings in examples
  mmc: block: Fix CQE recovery reset success
  mmc: sdhci-pci-gli: Fix GL9763E runtime PM when the system resumes from suspend
parents e71e60cd 47926041

Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ examples: 
      sd-uhs-sdr104;

      sdhci,auto-cmd12;

      interrupts = <0x0 0x26 0x4>;

      interrupt-names = "sdio0_0";

      clocks = <&scmi_clk 245>;

      clock-names = "sw_sdio";

    };
@@ -94,7 +93,6 @@ examples: 
      non-removable;

      bus-width = <0x8>;

      interrupts = <0x0 0x27 0x4>;

      interrupt-names = "sdio1_0";

      clocks = <&scmi_clk 245>;

      clock-names = "sw_sdio";

    };

Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
      - const: core

      - const: axi



  interrupts:

    maxItems: 1



  marvell,xenon-sdhc-id:

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

drivers/mmc/core/block.c

+1 −2
Original line number Diff line number Diff line
@@ -1499,7 +1499,6 @@ void mmc_blk_cqe_recovery(struct mmc_queue *mq) 
	err = mmc_cqe_recovery(host);

	if (err)

		mmc_blk_reset(mq->blkdata, host, MMC_BLK_CQE_RECOVERY);

	else

	mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY);



	pr_debug("%s: CQE recovery done\n", mmc_hostname(host));

drivers/mmc/host/sdhci-pci-gli.c

+3 −0
Original line number Diff line number Diff line
@@ -982,6 +982,9 @@ static int gl9763e_runtime_resume(struct sdhci_pci_chip *chip) 
	struct sdhci_host *host = slot->host;

	u16 clock;



	if (host->mmc->ios.power_mode != MMC_POWER_ON)

		return 0;



	clock = sdhci_readw(host, SDHCI_CLOCK_CONTROL);



	clock |= SDHCI_CLOCK_PLL_EN;