Skip to content

Commit 79ad471

Browse files
kamaldasu-cryptostorulf
authored andcommitted
mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore
The restore path for SDIO_CFG_CORE_V1 was incorrectly using SDIO_CFG_SD_PIN_SEL (offset 0x44) instead of SDIO_CFG_V1_SD_PIN_SEL (offset 0x54), causing the wrong register to be written on resume. The save path already uses the correct V1-specific offset. This affects BCM7445 and BCM72116 platforms which use the V1 config core. Fixes: b7e6148 ("mmc: sdhci-brcmstb: save and restore registers during PM") Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com> Cc: stable@vger.kernel.org Tested-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 6465a8b commit 79ad471

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/mmc/host/sdhci-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static void sdhci_brcmstb_restore_regs(struct mmc_host *mmc, enum cfg_core_ver v
116116
writel(sr->boot_main_ctl, priv->boot_regs + SDIO_BOOT_MAIN_CTL);
117117

118118
if (ver == SDIO_CFG_CORE_V1) {
119-
writel(sr->sd_pin_sel, cr + SDIO_CFG_SD_PIN_SEL);
119+
writel(sr->sd_pin_sel, cr + SDIO_CFG_V1_SD_PIN_SEL);
120120
return;
121121
}
122122

0 commit comments

Comments
 (0)