Commit 5e0b19ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'mmc-v4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Ulf writes:
  "MMC core:
    - Fixup conversion of debounce time to/from ms/us

   MMC host:
    - sdhi: Fixup whitelisting for Gen3 types"

* tag 'mmc-v4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: slot-gpio: Fix debounce time to use miliseconds again
  mmc: core: Fix debounce time to use microseconds
  mmc: sdhi: sys_dmac: check for all Gen3 types when whitelisting
parents 385afbf8 1b09d9c2
...@@ -235,7 +235,7 @@ int mmc_of_parse(struct mmc_host *host) ...@@ -235,7 +235,7 @@ int mmc_of_parse(struct mmc_host *host)
host->caps |= MMC_CAP_NEEDS_POLL; host->caps |= MMC_CAP_NEEDS_POLL;
ret = mmc_gpiod_request_cd(host, "cd", 0, true, ret = mmc_gpiod_request_cd(host, "cd", 0, true,
cd_debounce_delay_ms, cd_debounce_delay_ms * 1000,
&cd_gpio_invert); &cd_gpio_invert);
if (!ret) if (!ret)
dev_info(host->parent, "Got CD GPIO\n"); dev_info(host->parent, "Got CD GPIO\n");
......
...@@ -271,7 +271,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, ...@@ -271,7 +271,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
if (debounce) { if (debounce) {
ret = gpiod_set_debounce(desc, debounce); ret = gpiod_set_debounce(desc, debounce);
if (ret < 0) if (ret < 0)
ctx->cd_debounce_delay_ms = debounce; ctx->cd_debounce_delay_ms = debounce / 1000;
} }
if (gpio_invert) if (gpio_invert)
......
...@@ -498,7 +498,8 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = { ...@@ -498,7 +498,8 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = {
static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev) static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev)
{ {
if (of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible && if ((of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible ||
of_device_get_match_data(&pdev->dev) == &of_rcar_r8a7795_compatible) &&
!soc_device_match(gen3_soc_whitelist)) !soc_device_match(gen3_soc_whitelist))
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment