On Mon, 18 Nov 2019 at 11:47, Ivan Mikhaylov <i.mikhaylov@xxxxxxxxx> wrote:
>
> Add read_l callback in sdhci_ops with flipping of SDHCI_CARD_PRESENT
> bit in case of inverted card detection signal.
>
> Signed-off-by: Ivan Mikhaylov <i.mikhaylov@xxxxxxxxx>
Applied for next, thanks!
For clarity, I am leaving patch 1 for arm-soc.
Kind regards
Uffe
>
> diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> index 8962f6664381..56912e30c47e 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> @@ -111,7 +111,19 @@ static void aspeed_sdhci_set_bus_width(struct sdhci_host *host, int width)
> sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
> }
>
> +static u32 aspeed_sdhci_readl(struct sdhci_host *host, int reg)
> +{
> + u32 val = readl(host->ioaddr + reg);
> +
> + if (unlikely(reg == SDHCI_PRESENT_STATE) &&
> + (host->mmc->caps2 & MMC_CAP2_CD_ACTIVE_HIGH))
> + val ^= SDHCI_CARD_PRESENT;
> +
> + return val;
> +}
> +
> static const struct sdhci_ops aspeed_sdhci_ops = {
> + .read_l = aspeed_sdhci_readl,
> .set_clock = aspeed_sdhci_set_clock,
> .get_max_clock = aspeed_sdhci_get_max_clock,
> .set_bus_width = aspeed_sdhci_set_bus_width,
> --
> 2.20.1
>
