From patchwork Mon Mar 23 16:47:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 46208 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6CEEF214B0 for ; Mon, 23 Mar 2015 16:47:50 +0000 (UTC) Received: by lams18 with SMTP id s18sf28291301lam.2 for ; Mon, 23 Mar 2015 09:47:49 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=chmc8XXPUcE8DDJUbAkqJ/MHzs7fQacxJkpZZqQGEd8=; b=jBUrvsrohATrLiUMQxFM94axotS2r4xi560VWvZ0D0Kpc1LGrOdI8VYiUU/kn4N11g f8VcuRbkET5x7XGkkHzSn/lg262WjiH3GeI8wGAO6+gC7u2qqOZBsFR2oMi8ojbcZzJ5 +2msz6/S0uP63VQTB3sB3WvG2puu+YAX7TGQptzbeoUFx/o6XPUDZkSZOKu/kjYHyYqW cAnQVsK8gZqmCdoPhEa927cIEmg58VoP24S4i02Ox1NOsdu54F1wpHLjBMA90TzBUrZD TEHCTA4PByBYgphKXLeApJuwhyL64uPPvGq9u7XspwTIXDepMl1Ko9LHQQrNM1R+j22+ E+PQ== X-Gm-Message-State: ALoCoQlFUKFxwbhj+ozuGfE0g3Rxp7Hd5/aaU7sH2KNTT/5cX5Qen0gPwhONUcw9XIl/PUbAmVMN X-Received: by 10.180.80.35 with SMTP id o3mr4124157wix.0.1427129269364; Mon, 23 Mar 2015 09:47:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.165 with SMTP id rd5ls62695lac.77.gmail; Mon, 23 Mar 2015 09:47:49 -0700 (PDT) X-Received: by 10.112.133.35 with SMTP id oz3mr50661lbb.98.1427129269074; Mon, 23 Mar 2015 09:47:49 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id x3si982869laj.117.2015.03.23.09.47.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 09:47:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbsy1 with SMTP id sy1so122819075lbb.1 for ; Mon, 23 Mar 2015 09:47:49 -0700 (PDT) X-Received: by 10.152.120.134 with SMTP id lc6mr73029lab.72.1427129268940; Mon, 23 Mar 2015 09:47:48 -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.57.201 with SMTP id k9csp943274lbq; Mon, 23 Mar 2015 09:47:48 -0700 (PDT) X-Received: by 10.68.174.132 with SMTP id bs4mr22802719pbc.135.1427129266971; Mon, 23 Mar 2015 09:47:46 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pc10si1696538pac.187.2015.03.23.09.47.46; Mon, 23 Mar 2015 09:47:46 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S932157AbbCWQrf (ORCPT + 27 others); Mon, 23 Mar 2015 12:47:35 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:34399 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932134AbbCWQrb (ORCPT ); Mon, 23 Mar 2015 12:47:31 -0400 Received: by wibg7 with SMTP id g7so38089513wib.1 for ; Mon, 23 Mar 2015 09:47:30 -0700 (PDT) X-Received: by 10.180.78.202 with SMTP id d10mr20921704wix.25.1427129250636; Mon, 23 Mar 2015 09:47:30 -0700 (PDT) Received: from mms.wifi.mm-sol.com ([37.157.136.206]) by mx.google.com with ESMTPSA id ev7sm2120304wjb.47.2015.03.23.09.47.29 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Mar 2015 09:47:29 -0700 (PDT) From: Georgi Djakov To: ulf.hansson@linaro.org Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v3] mmc: sdhci-msm: Add support for vendor capabilities registers Date: Mon, 23 Mar 2015 18:47:29 +0200 Message-Id: <1427129249-3259-1-git-send-email-georgi.djakov@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: georgi.djakov@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.217.170 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: , Some versions of this controller do not advertise their 3.0v and 8bit bus-width support capabilities. It is required to explicitly set these capabilities for the specific controller versions. Signed-off-by: Georgi Djakov --- Changes since v2: * Use the generic sdhci bitfield defines, as the bits are matching. Thanks Bjorn for noticing this. Changes since v1: * Converted to separate read, modify, write statements. * Slightly updated comment text. Tested on msm8916-mtp board. drivers/mmc/host/sdhci-msm.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 3d32ce896b09..4a09f7608c66 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -22,6 +22,11 @@ #include "sdhci-pltfm.h" +#define CORE_MCI_VERSION 0x50 +#define CORE_VERSION_MAJOR_SHIFT 28 +#define CORE_VERSION_MAJOR_MASK (0xf << CORE_VERSION_MAJOR_SHIFT) +#define CORE_VERSION_MINOR_MASK 0xff + #define CORE_HC_MODE 0x78 #define HC_MODE_EN 0x1 #define CORE_POWER 0x0 @@ -41,6 +46,8 @@ #define CORE_VENDOR_SPEC 0x10c #define CORE_CLK_PWRSAVE BIT(1) +#define CORE_VENDOR_SPEC_CAPABILITIES0 0x11c + #define CDR_SELEXT_SHIFT 20 #define CDR_SELEXT_MASK (0xf << CDR_SELEXT_SHIFT) #define CMUX_SHIFT_PHASE_SHIFT 24 @@ -426,7 +433,9 @@ static int sdhci_msm_probe(struct platform_device *pdev) struct sdhci_msm_host *msm_host; struct resource *core_memres; int ret; - u16 host_version; + u16 host_version, core_minor; + u32 core_version, caps; + u8 core_major; msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL); if (!msm_host) @@ -516,6 +525,24 @@ static int sdhci_msm_probe(struct platform_device *pdev) host_version, ((host_version & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT)); + core_version = readl_relaxed(msm_host->core_mem + CORE_MCI_VERSION); + core_major = (core_version & CORE_VERSION_MAJOR_MASK) >> + CORE_VERSION_MAJOR_SHIFT; + core_minor = core_version & CORE_VERSION_MINOR_MASK; + dev_dbg(&pdev->dev, "MCI Version: 0x%08x, major: 0x%04x, minor: 0x%02x\n", + core_version, core_major, core_minor); + + /* + * Support for some capabilities is not advertised by newer + * controller versions and must be explicitly enabled. + */ + if (core_major >= 1 && core_minor != 0x11 && core_minor != 0x12) { + caps = readl_relaxed(host->ioaddr + SDHCI_CAPABILITIES); + caps |= SDHCI_CAN_VDD_300 | SDHCI_CAN_DO_8BIT; + writel_relaxed(caps, host->ioaddr + + CORE_VENDOR_SPEC_CAPABILITIES0); + } + ret = sdhci_add_host(host); if (ret) goto clk_disable;