From patchwork Thu Mar 8 14:52:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10268231 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 BE9A4602C8 for ; Thu, 8 Mar 2018 14:55:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC13B2846F for ; Thu, 8 Mar 2018 14:55:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58E8028C87; Thu, 8 Mar 2018 14:55:53 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3ADD0299DD for ; Thu, 8 Mar 2018 14:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=PaI0lXZIrtN6GGTeeanLkXEGxgyx3xDefhBmN2TZqts=; b=Lxwjpa11njBXQz5FpUE9ERTMR6 WTHIL29r6G1B2d5sNy5nPJ4gim8kmhJzMpHJM5W6BRo1xo2l7bh+mWRH4ybpZTzLe7ELnXjRIZn9p 4qJpjCI5wyt2DlgCMgkni7xUaXgdz3g59mU4OcJCwb2GQQAJ1hkZQzJdTajoQIlB4X0W5ETc2CeJk EjB6KeIAOoNX2+JvF1NaUkx7On7scHMOQWU5MWJHcdpudqxNnqdT680QrSQMs/oT7J2pxoBkbs2uW 5GrQ6D9eRuQDfTbSPq42ayQx9oog72+FOiFFDRZofAgKlQIIenPqbE1HPBXN1GQwzBqfUlUMXBrxA fpXnuKSw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1etww6-0008MU-OZ; Thu, 08 Mar 2018 14:54:26 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1etwuu-0007e2-Ss for linux-arm-kernel@lists.infradead.org; Thu, 08 Mar 2018 14:53:17 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 3F8BA207DA; Thu, 8 Mar 2018 15:53:06 +0100 (CET) Received: from localhost (unknown [185.94.189.190]) by mail.bootlin.com (Postfix) with ESMTPSA id A650920012; Thu, 8 Mar 2018 15:53:05 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , ulf.hansson@linaro.org Subject: [PATCH v2 4/8] mmc: sunxi: Move the power up action in a separate function Date: Thu, 8 Mar 2018 15:52:50 +0100 Message-Id: <81323d51de103251658535c4c787d687316395c7.1520520655.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180308_065313_337457_83040B8D X-CRM114-Status: GOOD ( 12.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , linux-mmc@vger.kernel.org, Quentin Schulz , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We'll need to have the power up behaviour in order to implement runtime_pm. Move it outside of the .set_ios callback for an easier access. And it improves readibility as a bonus. Signed-off-by: Maxime Ripard --- drivers/mmc/host/sunxi-mmc.c | 60 ++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 4e81fe171532..e4b44c4adb8f 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -888,6 +888,37 @@ static void sunxi_mmc_power_on(struct mmc_host *mmc, struct mmc_ios *ios) /* Android code had a usleep_range(50000, 55000); here */ } +static void sunxi_mmc_power_up(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct sunxi_mmc_host *host = mmc_priv(mmc); + + dev_dbg(mmc_dev(mmc), "Powering up\n"); + + if (!IS_ERR(mmc->supply.vmmc)) { + host->ferror = mmc_regulator_set_ocr(mmc, + mmc->supply.vmmc, + ios->vdd); + if (host->ferror) + return; + } + + if (!IS_ERR(mmc->supply.vqmmc)) { + host->ferror = regulator_enable(mmc->supply.vqmmc); + if (host->ferror) { + dev_err(mmc_dev(mmc), + "failed to enable vqmmc\n"); + return; + } + host->vqmmc_enabled = true; + } + + host->ferror = sunxi_mmc_init_host(mmc); + if (host->ferror) + return; + + sunxi_mmc_power_on(mmc, ios); +} + static void sunxi_mmc_power_off(struct mmc_host *mmc, struct mmc_ios *ios) { struct sunxi_mmc_host *host = mmc_priv(mmc); @@ -906,45 +937,20 @@ static void sunxi_mmc_power_off(struct mmc_host *mmc, struct mmc_ios *ios) static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { - struct sunxi_mmc_host *host = mmc_priv(mmc); - /* Set the power state */ switch (ios->power_mode) { case MMC_POWER_ON: + sunxi_mmc_power_on(mmc, ios); break; case MMC_POWER_UP: - if (!IS_ERR(mmc->supply.vmmc)) { - host->ferror = mmc_regulator_set_ocr(mmc, - mmc->supply.vmmc, - ios->vdd); - if (host->ferror) - return; - } - - if (!IS_ERR(mmc->supply.vqmmc)) { - host->ferror = regulator_enable(mmc->supply.vqmmc); - if (host->ferror) { - dev_err(mmc_dev(mmc), - "failed to enable vqmmc\n"); - return; - } - host->vqmmc_enabled = true; - } - - host->ferror = sunxi_mmc_init_host(mmc); - if (host->ferror) - return; - - dev_dbg(mmc_dev(mmc), "power on!\n"); + sunxi_mmc_power_up(mmc, ios); break; case MMC_POWER_OFF: sunxi_mmc_power_off(mmc, ios); break; } - - sunxi_mmc_power_on(mmc, ios); } static int sunxi_mmc_volt_switch(struct mmc_host *mmc, struct mmc_ios *ios)