From: Wolfram Sang Date: Tue, 17 Sep 2019 18:36:52 +0000 (+0200) Subject: mmc: tmio: remove workaround for NON_REMOVABLE X-Git-Tag: for-linus-20191205~86^2~66 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7a7dab237027939cb95dc07c4647b80bad5fbbde;p=linux-block.git mmc: tmio: remove workaround for NON_REMOVABLE PM has been reworked, so eMMC gets now detected on R-Car H3 ES1.0 and 2.0 as well as M3-N without the workaround. Card detect and write protect also still work. Remove the workaround. Signed-off-by: Wolfram Sang Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 9b6e1001e77c..63dc37481fba 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1208,15 +1208,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) if (!_host->reset) _host->reset = tmio_mmc_reset; - /* - * On Gen2+, eMMC with NONREMOVABLE currently fails because native - * hotplug gets disabled. It seems RuntimePM related yet we need further - * research. Since we are planning a PM overhaul anyway, let's enforce - * for now the device being active by enabling native hotplug always. - */ - if (pdata->flags & TMIO_MMC_MIN_RCAR2) - _host->native_hotplug = true; - /* * While using internal tmio hardware logic for card detection, we need * to ensure it stays powered for it to work.