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: 6307801 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 2D9A49F326 for ; Fri, 1 May 2015 01:47:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 462C9201BC for ; Fri, 1 May 2015 01:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47C2020165 for ; Fri, 1 May 2015 01:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751772AbbEABrZ (ORCPT ); Thu, 30 Apr 2015 21:47:25 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33336 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753193AbbEABrY (ORCPT ); Thu, 30 Apr 2015 21:47:24 -0400 Received: by pacwv17 with SMTP id wv17so77211382pac.0 for ; Thu, 30 Apr 2015 18:47:24 -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=B/bOAtoas5bzWBa+HSvvmRV/jEKhOWohpTLfxAu88eA=; b=QxWg3DQHfnjYYned3ymmxm6LRnLHbh84Bk/9rzXfSPseILjN0T1wKuRioFZmC1dNSM 6yH5BJxE4KfSclBVbfVCnPm1/l1mQZTJ3RBIkaedtcEMa+QiL95OGqNv2qsDI87WARl1 X+xGgWOTbPUOZvIKtGjCdC00mMCx3yAku+ZJIHR2ZpJVBWbL8SrkJmMjWRa3ErhWU6t5 BnkpvqwfLXzcmlqlOnbBYEjbWTTUUghtE4Plsk/Q78maX/QevKKoeXk3BqaAL8cUn3Pk 9bHVc/jIqsvzw2HAfXAa/04Sdk0a+kWP7iW8reC+30QsWYBVAh1RrKSVo/HqFWL7aJ7J vg0g== X-Gm-Message-State: ALoCoQnbd0wkvFFDg/EPrTdfn0boc626mPx1j48cO81cmDTqN8oqweLJuDTkYk2pcYlT9W07sCky 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: 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=unavailable 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 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);