From patchwork Fri May 23 12:52:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 30772 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D26242066E for ; Fri, 23 May 2014 12:53:09 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf18662552yha.11 for ; Fri, 23 May 2014 05:53:09 -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=uCDfPYA2x41M22jU0WTc69AFkx1j5WX3j6CNbP+jwm0=; b=nEsc8VpWrWxdhjydV/yCajMsOj9y4cPpbT3YXQeQCqKrcYmtxeco7XjB72fFSEeEqC RSbMZgw5G29Tn40NfoMsSIDJYgbS9lQ6TQMHI5+YEe/FPmKSWAybcdc34IcObYIJNXwD P+9HMqd2nuPLyKjAt6dwJ8qwMLIR5W8spxE1xAD3d1yzroOHi3n54v0SmO58Vy6DH0qj N9nIqduODC6r1GybUkYFxx+zu6Z7qFZmIYajro0m3On5Tyb7tQuyD41YOr2vElkCkTwN aSpxFphuQrs5HHPP73dlPfolVLfjYEN/66g0vPjfbWiCEgum3ODDrR68mdlDbPCGGJRJ 5vRQ== X-Gm-Message-State: ALoCoQlMj/1n8x27WmOXRmt2i+1PqIrLSnlmBP97bx6rwq8FN9uF5MAbKziiswsv154xWv9hCUDo X-Received: by 10.52.142.72 with SMTP id ru8mr1770022vdb.0.1400849589524; Fri, 23 May 2014 05:53:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.36 with SMTP id f33ls1707559qga.19.gmail; Fri, 23 May 2014 05:53:09 -0700 (PDT) X-Received: by 10.58.74.201 with SMTP id w9mr217913vev.56.1400849589415; Fri, 23 May 2014 05:53:09 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id fv10si1542476vdc.39.2014.05.23.05.53.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 05:53:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so6186430veb.17 for ; Fri, 23 May 2014 05:53:09 -0700 (PDT) X-Received: by 10.58.185.165 with SMTP id fd5mr880629vec.41.1400849589237; Fri, 23 May 2014 05:53:09 -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.220.221.72 with SMTP id ib8csp29059vcb; Fri, 23 May 2014 05:53:08 -0700 (PDT) X-Received: by 10.68.211.195 with SMTP id ne3mr5479944pbc.121.1400849588165; Fri, 23 May 2014 05:53:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zc2si3801953pac.109.2014.05.23.05.53.07; Fri, 23 May 2014 05:53:07 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-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 S1753065AbaEWMwy (ORCPT + 3 others); Fri, 23 May 2014 08:52:54 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:48899 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752966AbaEWMwx (ORCPT ); Fri, 23 May 2014 08:52:53 -0400 Received: by mail-wg0-f43.google.com with SMTP id l18so4666871wgh.26 for ; Fri, 23 May 2014 05:52:52 -0700 (PDT) X-Received: by 10.194.119.34 with SMTP id kr2mr4216312wjb.34.1400849572111; Fri, 23 May 2014 05:52:52 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-149-4-211.as13285.net. [78.149.4.211]) by mx.google.com with ESMTPSA id l9sm2797833wic.21.2014.05.23.05.52.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 May 2014 05:52:51 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Russell King , Ulf Hansson , linux-mmc@vger.kernel.org Cc: Chris Ball , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linus.walleij@linaro.org, Srinivas Kandagatla Subject: [PATCH v3 11/13] mmc: mmci: Add support to data commands via variant structure. Date: Fri, 23 May 2014 13:52:48 +0100 Message-Id: <1400849568-7543-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400849362-7007-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1400849362-7007-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@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.128.172 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: , From: Srinivas Kandagatla On some SOCs like Qcom there are explicit bits in the command register to specify if its a data transfer command or not. So this patch adds support to such bits in variant data, giving more flexibility to the driver. Signed-off-by: Srinivas Kandagatla Reviewed-by: Linus Walleij --- drivers/mmc/host/mmci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 6434f5b1..5cbf644 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -59,6 +59,7 @@ static unsigned int fmax = 515633; * is asserted (likewise for RX) * @fifohalfsize: number of bytes that can be written when MCI_TXFIFOHALFEMPTY * is asserted (likewise for RX) + * @data_cmd_enable: enable value for data commands. * @sdio: variant supports SDIO * @st_clkdiv: true if using a ST-specific clock divider algorithm * @datactrl_mask_ddrmode: ddr mode mask in datactrl register. @@ -81,6 +82,7 @@ struct variant_data { unsigned int datalength_bits; unsigned int fifosize; unsigned int fifohalfsize; + unsigned int data_cmd_enable; unsigned int datactrl_mask_ddrmode; bool sdio; bool st_clkdiv; @@ -189,6 +191,7 @@ static struct variant_data variant_qcom = { MCI_QCOM_CLK_FEEDBACK_CLK, .clkreg_8bit_bus_enable = MCI_QCOM_CLK_WIDEBUS_8, .datactrl_mask_ddrmode = MCI_QCOM_CLK_DDR_MODE, + .data_cmd_enable = MCI_QCOM_CSPM_DATCMD, .blksz_datactrl4 = true, .datalength_bits = 24, .blksz_datactrl4 = true, @@ -875,6 +878,9 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) if (/*interrupt*/0) c |= MCI_CPSM_INTERRUPT; + if (mmc_cmd_type(cmd) == MMC_CMD_ADTC) + c |= host->variant->data_cmd_enable; + host->cmd = cmd; mmci_writel(host, cmd->arg, MMCIARGUMENT);