mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-23 17:47:28 +08:00
d81c03f05e
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From faa9140ce1086fe2fe86bb6008907d2b62436d6f Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 15 Apr 2025 08:37:05 +0100
|
|
Subject: [PATCH] fixup! mmc: sdhci-of-dwcmshc: define sdio timeout clocks
|
|
|
|
The usage of the .data field of the of_device_id array changed with the
|
|
move to kernel 6.11, but because it holds a void pointer there were
|
|
no warnings that the sdhci_dwcmshc_rp1_data was now the wrong type.
|
|
|
|
Convert sdhci_dwcmshc_rp1_data to a dwcmshc_pltfm_data to avoid a crash
|
|
when one of RP1's SDIO interfaces is enabled.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/6778
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/mmc/host/sdhci-of-dwcmshc.c | 16 +++++++++-------
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-of-dwcmshc.c
|
|
+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
|
|
@@ -1221,13 +1221,15 @@ static const struct dwcmshc_pltfm_data s
|
|
};
|
|
#endif
|
|
|
|
-static const struct sdhci_pltfm_data sdhci_dwcmshc_rp1_pdata = {
|
|
- .ops = &sdhci_dwcmshc_ops,
|
|
- .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
|
|
- SDHCI_QUIRK_BROKEN_CARD_DETECTION,
|
|
- .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
|
|
- SDHCI_QUIRK2_BROKEN_HS200 |
|
|
- SDHCI_QUIRK2_SPURIOUS_INT_RESP,
|
|
+static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rp1_pdata = {
|
|
+ .pdata = {
|
|
+ .ops = &sdhci_dwcmshc_ops,
|
|
+ .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
|
|
+ SDHCI_QUIRK_BROKEN_CARD_DETECTION,
|
|
+ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
|
|
+ SDHCI_QUIRK2_BROKEN_HS200 |
|
|
+ SDHCI_QUIRK2_SPURIOUS_INT_RESP,
|
|
+ }
|
|
};
|
|
|
|
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
|