Skip to content

Commit 957fc9f

Browse files
pelwellpopcornmix
authored andcommitted
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: #6778 Signed-off-by: Phil Elwell <[email protected]>
1 parent 505c581 commit 957fc9f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

drivers/mmc/host/sdhci-of-dwcmshc.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,13 +1250,15 @@ static const struct dwcmshc_pltfm_data sdhci_dwcmshc_bf3_pdata = {
12501250
};
12511251
#endif
12521252

1253-
static const struct sdhci_pltfm_data sdhci_dwcmshc_rp1_pdata = {
1254-
.ops = &sdhci_dwcmshc_ops,
1255-
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
1256-
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
1257-
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
1258-
SDHCI_QUIRK2_BROKEN_HS200 |
1259-
SDHCI_QUIRK2_SPURIOUS_INT_RESP,
1253+
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rp1_pdata = {
1254+
.pdata = {
1255+
.ops = &sdhci_dwcmshc_ops,
1256+
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
1257+
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
1258+
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
1259+
SDHCI_QUIRK2_BROKEN_HS200 |
1260+
SDHCI_QUIRK2_SPURIOUS_INT_RESP,
1261+
}
12601262
};
12611263

12621264
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {

0 commit comments

Comments
 (0)