tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: b7e614802e3f ("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>

authored by

Kamal Dasu and committed by
Ulf Hansson 79ad4715 6465a8bb

+1 -1
+1 -1
drivers/mmc/host/sdhci-brcmstb.c
··· 116 116 writel(sr->boot_main_ctl, priv->boot_regs + SDIO_BOOT_MAIN_CTL); 117 117 118 118 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); 120 120 return; 121 121 } 122 122