On 4/05/20 9:39 am, Ben Chuang wrote:
> From: Ben Chuang <ben.chuang@xxxxxxxxxxxxxxxxxxx>
>
> Need to clear some bits in a vendor-defined register after reboot from
> Windows 10.
>
> Fixes: e51df6ce668a ("mmc: host: sdhci-pci: Add Genesys Logic GL975x support")
> Reported-by: Grzegorz Kowal <custos.mentis@xxxxxxxxx>
> Signed-off-by: Ben Chuang <ben.chuang@xxxxxxxxxxxxxxxxxxx>
Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> drivers/mmc/host/sdhci-pci-gli.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index ce15a05f23d4..8170b659f2af 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -26,6 +26,9 @@
> #define SDHCI_GLI_9750_DRIVING_2 GENMASK(27, 26)
> #define GLI_9750_DRIVING_1_VALUE 0xFFF
> #define GLI_9750_DRIVING_2_VALUE 0x3
> +#define SDHCI_GLI_9750_SEL_1 BIT(29)
> +#define SDHCI_GLI_9750_SEL_2 BIT(31)
> +#define SDHCI_GLI_9750_ALL_RST (BIT(24)|BIT(25)|BIT(28)|BIT(30))
>
> #define SDHCI_GLI_9750_PLL 0x864
> #define SDHCI_GLI_9750_PLL_TX2_INV BIT(23)
> @@ -122,6 +125,8 @@ static void gli_set_9750(struct sdhci_host *host)
> GLI_9750_DRIVING_1_VALUE);
> driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
> GLI_9750_DRIVING_2_VALUE);
> + driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
> + driving_value |= SDHCI_GLI_9750_SEL_2;
> sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);
>
> sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
>
