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 -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmKfHi4XHHVsZi5oYW5z c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjClTfg/+OfGmdxO6oh+1BjG/7u5ocvRP NtK/5lA/0cckn0SSpUZ3qZ/DYtusPpow/C0cUyPh4xjEXyVvUT7yZgz/Mvc+WN0E 9XHjdmwSD+W8dMQB/0vKScuL6l2NTQAOqYnMRZgA6TeeABPncl0anyXze2hLLPEF JRg8cp8ZVNSKLclq5o6MalhhPW7J6xne8AavmF+ZCd3koAJzH5u7+P322Q+q2Yby C/b88hxS8sunlwda3vtroPSdmZQskaTAUC9w7lFY8jkkJqCKxemA8KJ33QF3geEj 1J6QCaUQVPrgcesEdRZizpBR0VJtKI5kGJhiSjER3PLnfZlEFPDV4JX+myV/0L2Q RBaMOEEI+7CSqlB+Dg17rbZaSVjPupk9RTSjO95lyK4NQS6xjPIJpQEz1LL83YvX YVXHItoTQ/WWa0uavzN1ybj3KEn9Np83dHFVf37Cp7D1nZIneDs/hsNxAN/okRMe k+ONFZpDx/qUsYHbfeJcQEieBkY3ETJ3k2vWRG9BlUbukVK4FDt6kZOnt3MRHGqW hX/UyCN8glbNzawRcIlwAlXrIyDRym0/fjrYY5Npw6gIu8nrEN5woeQ5iubK3sbt fdz0hmGOQnqEOBHLCOp/WjPgzwv3upmrRTT00D6956aP8oy/BNnROdoTwfTBFIgY +c4g+wHL2gX8d+tGNwc= =SefD -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
f7a447eda2
|
@ -75,7 +75,6 @@ examples:
|
||||||
sd-uhs-sdr104;
|
sd-uhs-sdr104;
|
||||||
sdhci,auto-cmd12;
|
sdhci,auto-cmd12;
|
||||||
interrupts = <0x0 0x26 0x4>;
|
interrupts = <0x0 0x26 0x4>;
|
||||||
interrupt-names = "sdio0_0";
|
|
||||||
clocks = <&scmi_clk 245>;
|
clocks = <&scmi_clk 245>;
|
||||||
clock-names = "sw_sdio";
|
clock-names = "sw_sdio";
|
||||||
};
|
};
|
||||||
|
@ -94,7 +93,6 @@ examples:
|
||||||
non-removable;
|
non-removable;
|
||||||
bus-width = <0x8>;
|
bus-width = <0x8>;
|
||||||
interrupts = <0x0 0x27 0x4>;
|
interrupts = <0x0 0x27 0x4>;
|
||||||
interrupt-names = "sdio1_0";
|
|
||||||
clocks = <&scmi_clk 245>;
|
clocks = <&scmi_clk 245>;
|
||||||
clock-names = "sw_sdio";
|
clock-names = "sw_sdio";
|
||||||
};
|
};
|
||||||
|
|
|
@ -56,6 +56,9 @@ properties:
|
||||||
- const: core
|
- const: core
|
||||||
- const: axi
|
- const: axi
|
||||||
|
|
||||||
|
interrupts:
|
||||||
|
maxItems: 1
|
||||||
|
|
||||||
marvell,xenon-sdhc-id:
|
marvell,xenon-sdhc-id:
|
||||||
$ref: /schemas/types.yaml#/definitions/uint32
|
$ref: /schemas/types.yaml#/definitions/uint32
|
||||||
minimum: 0
|
minimum: 0
|
||||||
|
|
|
@ -1499,8 +1499,7 @@ void mmc_blk_cqe_recovery(struct mmc_queue *mq)
|
||||||
err = mmc_cqe_recovery(host);
|
err = mmc_cqe_recovery(host);
|
||||||
if (err)
|
if (err)
|
||||||
mmc_blk_reset(mq->blkdata, host, MMC_BLK_CQE_RECOVERY);
|
mmc_blk_reset(mq->blkdata, host, MMC_BLK_CQE_RECOVERY);
|
||||||
else
|
mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY);
|
||||||
mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY);
|
|
||||||
|
|
||||||
pr_debug("%s: CQE recovery done\n", mmc_hostname(host));
|
pr_debug("%s: CQE recovery done\n", mmc_hostname(host));
|
||||||
}
|
}
|
||||||
|
|
|
@ -982,6 +982,9 @@ static int gl9763e_runtime_resume(struct sdhci_pci_chip *chip)
|
||||||
struct sdhci_host *host = slot->host;
|
struct sdhci_host *host = slot->host;
|
||||||
u16 clock;
|
u16 clock;
|
||||||
|
|
||||||
|
if (host->mmc->ios.power_mode != MMC_POWER_ON)
|
||||||
|
return 0;
|
||||||
|
|
||||||
clock = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
clock = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
||||||
|
|
||||||
clock |= SDHCI_CLOCK_PLL_EN;
|
clock |= SDHCI_CLOCK_PLL_EN;
|
||||||
|
|
Loading…
Reference in New Issue