From patchwork Wed Dec 28 15:34:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ayaka X-Patchwork-Id: 9490459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D5ECC602A7 for ; Wed, 28 Dec 2016 15:35:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC5A7200E7 for ; Wed, 28 Dec 2016 15:35:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D6D22623C; Wed, 28 Dec 2016 15:35:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 081CD200E7 for ; Wed, 28 Dec 2016 15:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751154AbcL1PfI (ORCPT ); Wed, 28 Dec 2016 10:35:08 -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 Received: from misaki.sumomo.pri (unknown [IPv6:2001:470:b30d:2:3fe5:5e2:ef97:4abb]) by kozue.soulik.info (Postfix) with ESMTPA id 2F81C1012AF; Thu, 29 Dec 2016 00:35:34 +0900 (JST) 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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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, }, };