OSDN Git Service

mmc: tmio: remove workaround for NON_REMOVABLE
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 17 Sep 2019 18:36:52 +0000 (20:36 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 13 Nov 2019 15:10:16 +0000 (16:10 +0100)
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 <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/tmio_mmc_core.c

index 9b6e100..63dc374 100644 (file)
@@ -1209,15 +1209,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
                _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.
         */