From patchwork Fri May 1 01:46:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 47883 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CA0AF2121F for ; Fri, 1 May 2015 01:47:28 +0000 (UTC) Received: by wixv7 with SMTP id v7sf11382829wix.0 for ; Thu, 30 Apr 2015 18:47:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=SxrKOdI1jVlacWQ9Pj+rBndelByfLIzQVkeIFrBxg8w=; b=kg94l2769gIX2NyISBIyDtuuT1NTBQmiaRO7ZNYi6lVDdyO0f45ehhB+Kbvspw4e3I RDTX4LtT+mI99NbWLsscB2EmqbOnRABkWNCoqNF1WM3A04mmydEg0vIaxIMXpa3cAWMv 62cmC/htHFUhYuqO+x9apyhYFzD4pzaNNikEi0H/Ens/Z2L8HysVPh++PJ1uJ2waKSko /alexvd6LJCd2yK+21uAmSVdkCLg0VtX5TVmzTm91evsY6mmX66uZmonqwSlhuaZZmw2 q0Z2FK4zFyyiHlT0ZzbsU0uUxxQf2xjQUQxgapcEFVFyCuP77MWgOcEnfd8bZ4i0yP11 xYMw== X-Gm-Message-State: ALoCoQmlX+gO7YJ3qqgBZHT7fl6hTnh6wzGn5Abvzvm2a0hXYh4GTwlFZnDvSr8oEUdKqRQKE3hF X-Received: by 10.180.211.168 with SMTP id nd8mr4384364wic.4.1430444848125; Thu, 30 Apr 2015 18:47:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.9 with SMTP id 9ls513781laq.89.gmail; Thu, 30 Apr 2015 18:47:27 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr6238578lag.112.1430444847964; Thu, 30 Apr 2015 18:47:27 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id t4si2957638lbk.135.2015.04.30.18.47.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 18:47:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lagv1 with SMTP id v1so56966998lag.3 for ; Thu, 30 Apr 2015 18:47:27 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr6209753lac.41.1430444847868; Thu, 30 Apr 2015 18:47:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp33323lbt; Thu, 30 Apr 2015 18:47:27 -0700 (PDT) X-Received: by 10.68.219.101 with SMTP id pn5mr13488349pbc.77.1430444846763; Thu, 30 Apr 2015 18:47:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t17si5848838pdi.227.2015.04.30.18.47.25; Thu, 30 Apr 2015 18:47:26 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbbEABrZ (ORCPT + 6 others); Thu, 30 Apr 2015 21:47:25 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:36077 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751772AbbEABrY (ORCPT ); Thu, 30 Apr 2015 21:47:24 -0400 Received: by pdea3 with SMTP id a3so78272913pde.3 for ; Thu, 30 Apr 2015 18:47:24 -0700 (PDT) X-Received: by 10.66.221.34 with SMTP id qb2mr13420275pac.42.1430444844144; Thu, 30 Apr 2015 18:47:24 -0700 (PDT) Received: from localhost.localdomain ([180.150.153.56]) by mx.google.com with ESMTPSA id ef3sm3354503pbc.26.2015.04.30.18.47.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Apr 2015 18:47:23 -0700 (PDT) From: Zhangfei Gao To: Jaehoon Chung , Ulf Hansson Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Zhangfei Gao , "Jorge A. Ramirez-Ortiz" , Dan Yuan Subject: [PATCH 3/3] mmc: dw_mmc: k3: support hi6220 Date: Fri, 1 May 2015 09:46:58 +0800 Message-Id: <1430444818-7740-4-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430444818-7740-1-git-send-email-zhangfei.gao@linaro.org> References: <1430444818-7740-1-git-send-email-zhangfei.gao@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zhangfei.gao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Jorge A. Ramirez-Ortiz Signed-off-by: Dan Yuan Signed-off-by: Zhangfei Gao --- drivers/mmc/host/dw_mmc-k3.c | 104 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c index 650f9cc..ab3dc59 100644 --- a/drivers/mmc/host/dw_mmc-k3.c +++ b/drivers/mmc/host/dw_mmc-k3.c @@ -8,16 +8,29 @@ * (at your option) any later version. */ -#include -#include #include +#include +#include #include #include +#include #include +#include +#include +#include #include "dw_mmc.h" #include "dw_mmc-pltfm.h" +#define AO_SCTRL_SEL18 BIT(10) +#define AO_SCTRL_CTRL3 0x40C + +#define SDMMC_CMD_DISABLE_BOOT BIT(26) + +struct k3_priv { + struct regmap *reg; +}; + static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios) { int ret; @@ -33,8 +46,95 @@ static const struct dw_mci_drv_data k3_drv_data = { .set_ios = dw_mci_k3_set_ios, }; +static int dw_mci_hi6220_parse_dt(struct dw_mci *host) +{ + struct k3_priv *priv; + + priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->reg = syscon_regmap_lookup_by_phandle(host->dev->of_node, + "hisilicon,peripheral-syscon"); + if (IS_ERR(priv->reg)) + priv->reg = NULL; + + host->priv = priv; + return 0; +} + +static int dw_mci_hi6220_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct dw_mci_slot *slot = mmc_priv(mmc); + struct k3_priv *priv; + struct dw_mci *host; + int min_uv, max_uv; + int ret; + + host = slot->host; + priv = host->priv; + + if (!priv || !priv->reg) + return 0; + + min_uv = 1800000; + max_uv = 1800000; + + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { + ret = regmap_update_bits(priv->reg, AO_SCTRL_CTRL3, + AO_SCTRL_SEL18, 0); + if (ret) { + dev_dbg(host->dev, "switch voltage failed\n"); + return ret; + } + min_uv = 3000000; + max_uv = 3000000; + } + + if (IS_ERR_OR_NULL(mmc->supply.vqmmc)) + return 0; + + ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); + if (ret) { + dev_dbg(host->dev, "Regulator set error %d: %d - %d\n", + ret, min_uv, max_uv); + return ret; + } + + ret = regulator_enable(mmc->supply.vqmmc); + if (ret) { + dev_dbg(host->dev, "Regulator enable error %d\n", ret); + return ret; + } + + usleep_range(5000, 5500); + + return 0; +} + +static void dw_mci_hi6220_set_ios(struct dw_mci *host, struct mmc_ios *ios) +{ + int ret; + unsigned int clock; + + clock = (ios->clock <= 25000000) ? 25000000 : ios->clock; + + ret = clk_set_rate(host->biu_clk, clock); + if (ret) + dev_warn(host->dev, "failed to set rate %uHz\n", clock); + + host->bus_hz = clk_get_rate(host->biu_clk); +} + +static const struct dw_mci_drv_data hi6220_data = { + .switch_voltage = dw_mci_hi6220_switch_voltage, + .set_ios = dw_mci_hi6220_set_ios, + .parse_dt = dw_mci_hi6220_parse_dt, +}; + static const struct of_device_id dw_mci_k3_match[] = { { .compatible = "hisilicon,hi4511-dw-mshc", .data = &k3_drv_data, }, + { .compatible = "hisilicon,hi6220-dw-mshc", .data = &hi6220_data, }, {}, }; MODULE_DEVICE_TABLE(of, dw_mci_k3_match);