Merge "mmc: sdhci: use cmd_timeout_ms for calculating request timeout"