From patchwork Thu May 14 08:45:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 6403221 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B84059F32B for ; Thu, 14 May 2015 08:45:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D492F203E9 for ; Thu, 14 May 2015 08:45:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F08832022A for ; Thu, 14 May 2015 08:45:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932456AbbENIpv (ORCPT ); Thu, 14 May 2015 04:45:51 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35399 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753071AbbENIpu (ORCPT ); Thu, 14 May 2015 04:45:50 -0400 Received: by pabtp1 with SMTP id tp1so78445030pab.2 for ; Thu, 14 May 2015 01:45:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Z/x8Rzui7ow27r6kP6Tck30cCLXw2KTKsnOfN9xpKE=; b=C0u3fjSIfq5LK/6yeHltG5YQxdHebhL+tOxkt1fogV5J5Ul+2JExkfg5AIYUlYZaIt 2vtePuR30C/xGeQ8O5Mz5Pugzki3De8LZnYzfj3MR5wET5bMw4YIvVi4Tq0krG+eYnKs UKpXkKJ+JcSMN8hP9eCVMSXb9nE9mLYNWq0heErCjz9/flGBRUhoW/tFnYKp1xc+gGfs gppTzwc+IoU8+5GoRGZ15ooNT+8BNwSHVc3wogtKDhwwg0vfkTu95VOtAnKXSZGLBl/6 rltHjr3bHx1K0hbppcOsOpa3nT9sevW51loQ6l0NsCWyZJDTb6I5U+3g86cLRhW2aHRj 1/6w== X-Gm-Message-State: ALoCoQkX6LmE9Q8Xak4tCe3wJsdGj//CuawlZupoj/bFN1FK09oaPA5vrnT6uu2sSjxXFfQ7ljK8 X-Received: by 10.69.10.196 with SMTP id ec4mr6012479pbd.69.1431593150077; Thu, 14 May 2015 01:45:50 -0700 (PDT) Received: from localhost.localdomain ([180.150.148.224]) by mx.google.com with ESMTPSA id dk5sm21625161pdb.88.2015.05.14.01.45.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 May 2015 01:45:48 -0700 (PDT) From: Zhangfei Gao To: Jaehoon Chung , ulf.hansson@linaro.org Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Zhangfei Gao , "Jorge A. Ramirez-Ortiz" , Dan Yuan Subject: [PATCH v3 2/3] mmc: dw_mmc: add switch_voltage Date: Thu, 14 May 2015 16:45:18 +0800 Message-Id: <1431593119-31889-3-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431593119-31889-1-git-send-email-zhangfei.gao@linaro.org> References: <1431593119-31889-1-git-send-email-zhangfei.gao@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP switch_voltage is required on some platform since special register accessing Signed-off-by: Jorge A. Ramirez-Ortiz Signed-off-by: Dan Yuan Signed-off-by: Zhangfei Gao --- drivers/mmc/host/dw_mmc.c | 4 ++++ drivers/mmc/host/dw_mmc.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5f5adaf..ce66565 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1236,11 +1236,15 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) { struct dw_mci_slot *slot = mmc_priv(mmc); struct dw_mci *host = slot->host; + const struct dw_mci_drv_data *drv_data = host->drv_data; u32 uhs; u32 v18 = SDMMC_UHS_18V << slot->id; int min_uv, max_uv; int ret; + if (drv_data && drv_data->switch_voltage) + return drv_data->switch_voltage(mmc, ios); + /* * Program the voltage. Note that some instances of dw_mmc may use * the UHS_REG for this. For other instances (like exynos) the UHS_REG diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index f45ab91..c723617 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -287,5 +287,7 @@ struct dw_mci_drv_data { int (*execute_tuning)(struct dw_mci_slot *slot); int (*prepare_hs400_tuning)(struct dw_mci *host, struct mmc_ios *ios); + int (*switch_voltage)(struct mmc_host *mmc, + struct mmc_ios *ios); }; #endif /* _DW_MMC_H_ */