Commit 79ad4715 authored by Kamal Dasu's avatar Kamal Dasu Committed by Ulf Hansson
Browse files

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: b7e61480 ("mmc: sdhci-brcmstb: save and restore registers during PM")
Signed-off-by: default avatarKamal Dasu <kamal.dasu@broadcom.com>
Cc: stable@vger.kernel.org
Tested-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6465a8bb

drivers/mmc/host/sdhci-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void sdhci_brcmstb_restore_regs(struct mmc_host *mmc, enum cfg_core_ver v 
		writel(sr->boot_main_ctl, priv->boot_regs + SDIO_BOOT_MAIN_CTL);



	if (ver == SDIO_CFG_CORE_V1) {

		writel(sr->sd_pin_sel, cr + SDIO_CFG_SD_PIN_SEL);

		writel(sr->sd_pin_sel, cr + SDIO_CFG_V1_SD_PIN_SEL);

		return;

	}