Skip to content

Commit faa9140

Browse files
committed
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 3b93259 commit faa9140

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
@@ -1221,13 +1221,15 @@ static const struct dwcmshc_pltfm_data sdhci_dwcmshc_bf3_pdata = {
12211221
};
12221222
#endif
12231223

1224-
static const struct sdhci_pltfm_data sdhci_dwcmshc_rp1_pdata = {
1225-
.ops = &sdhci_dwcmshc_ops,
1226-
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
1227-
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
1228-
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
1229-
SDHCI_QUIRK2_BROKEN_HS200 |
1230-
SDHCI_QUIRK2_SPURIOUS_INT_RESP,
1224+
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rp1_pdata = {
1225+
.pdata = {
1226+
.ops = &sdhci_dwcmshc_ops,
1227+
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
1228+
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
1229+
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
1230+
SDHCI_QUIRK2_BROKEN_HS200 |
1231+
SDHCI_QUIRK2_SPURIOUS_INT_RESP,
1232+
}
12311233
};
12321234

12331235
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {

0 commit comments

Comments
 (0)