| Message ID | 20191118104646.3838-4-i.mikhaylov@yadro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add inversion signal presence support | expand |
On Mon, 18 Nov 2019, at 21:16, Ivan Mikhaylov 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@yadro.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
On 18/11/19 12:46 PM, Ivan Mikhaylov 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@yadro.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > > 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, >
On Mon, 18 Nov 2019 at 11:47, Ivan Mikhaylov <i.mikhaylov@yadro.com> 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@yadro.com> 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 >
On Wed, 20 Nov 2019 at 12:59, Ulf Hansson <ulf.hansson@linaro.org> wrote: > > On Mon, 18 Nov 2019 at 11:47, Ivan Mikhaylov <i.mikhaylov@yadro.com> 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@yadro.com> > > Applied for next, thanks! > > For clarity, I am leaving patch 1 for arm-soc. Thanks. I'd already sent the aspeed pull request for 5.5, so I'll send the device tree patch next merge window. Cheers, Joel
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,
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@yadro.com>