Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751733AbcL1PfJ (ORCPT ); Wed, 28 Dec 2016 10:35:09 -0500 Received: from kozue.soulik.info ([108.61.200.231]:33938 "EHLO kozue.soulik.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbcL1PfI (ORCPT ); Wed, 28 Dec 2016 10:35:08 -0500 From: Randy Li To: linux-mmc@vger.kernel.org Cc: jh80.chung@samsung.com, shawn.lin@rock-chips.com, randy.li@rock-chips.com, ulf.hansson@linaro.org, heiko@sntech.de, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Randy Li Subject: [PATCH] Revert "mmc: dw_mmc-rockchip: add runtime PM support" Date: Wed, 28 Dec 2016 23:34:48 +0800 Message-Id: <1482939288-14950-1-git-send-email-ayaka@soulik.info> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2409 Lines: 83 This reverts commit f90142683f04bcb0729bf0df67a5e29562b725b9. It is reported that making RK3288 can't boot from eMMC/MMC. Signed-off-by: Randy Li --- drivers/mmc/host/dw_mmc-rockchip.c | 41 +++----------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index 9a46e46..3189234 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "dw_mmc.h" @@ -327,7 +326,6 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) { const struct dw_mci_drv_data *drv_data; const struct of_device_id *match; - int ret; if (!pdev->dev.of_node) return -ENODEV; @@ -335,49 +333,16 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) match = of_match_node(dw_mci_rockchip_match, pdev->dev.of_node); drv_data = match->data; - pm_runtime_get_noresume(&pdev->dev); - pm_runtime_set_active(&pdev->dev); - pm_runtime_enable(&pdev->dev); - pm_runtime_set_autosuspend_delay(&pdev->dev, 50); - pm_runtime_use_autosuspend(&pdev->dev); - - ret = dw_mci_pltfm_register(pdev, drv_data); - if (ret) { - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); - return ret; - } - - pm_runtime_put_autosuspend(&pdev->dev); - - return 0; + return dw_mci_pltfm_register(pdev, drv_data); } -static int dw_mci_rockchip_remove(struct platform_device *pdev) -{ - pm_runtime_get_sync(&pdev->dev); - pm_runtime_disable(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); - - return dw_mci_pltfm_remove(pdev); -} - -static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(dw_mci_runtime_suspend, - dw_mci_runtime_resume, - NULL) -}; - static struct platform_driver dw_mci_rockchip_pltfm_driver = { .probe = dw_mci_rockchip_probe, - .remove = dw_mci_rockchip_remove, + .remove = dw_mci_pltfm_remove, .driver = { .name = "dwmmc_rockchip", .of_match_table = dw_mci_rockchip_match, - .pm = &dw_mci_rockchip_dev_pm_ops, + .pm = &dw_mci_pltfm_pmops, }, }; -- 2.7.4