From patchwork Mon Apr 21 21:49:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4026601 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 81B46BFF02 for ; Mon, 21 Apr 2014 21:49:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B59612035E for ; Mon, 21 Apr 2014 21:49:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC99A201EF for ; Mon, 21 Apr 2014 21:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755021AbaDUVti (ORCPT ); Mon, 21 Apr 2014 17:49:38 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:45391 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754684AbaDUVte (ORCPT ); Mon, 21 Apr 2014 17:49:34 -0400 Received: by mail-wg0-f47.google.com with SMTP id x12so3093053wgg.6 for ; Mon, 21 Apr 2014 14:49:33 -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=FjZEUGDLiPb0JYVuLbqmBbKZfSzMZbCM4IlgDaPadWA=; b=ILqPMN4laN7J6/woQsHDQw04H+9+68a+gwIhlAUcvFyVfBYRTUftFjnL+AbsRrGmh6 YKXCx97tXNtvTx+OYvlZkZrWFau5uxrfnZSzaHk1jJdZ4199rtRF+EkEd+2q/WI5jeRZ yvvX160tD1e/HTNzoK1aZDGZ8px6U2tu6b3cBOofntxfOXrkUYMDbVjix1vurmvhta2g JGGoG91XPlXKtHj0cVlC/rmSSo4nZiexFJyHq95ANcZyAjJ3EqJIIWAYN/+vN9oi+mLx zkLIBoqsG62HaO8G5W6Z0nFELRdXHcMWOArXlqvUAldcPtumcNO+27hoP0MU/OEI7fVQ XYnw== X-Gm-Message-State: ALoCoQluQ+F0j95z8i8qJZkwdv4QEydo22rRGFRWriYfOcaYF3XZ47GWXI027rvXWVUl4IV0lXGR X-Received: by 10.180.94.37 with SMTP id cz5mr15576388wib.19.1398116972935; Mon, 21 Apr 2014 14:49:32 -0700 (PDT) Received: from srinivas-Inspiron-N5050.dlink.com (host-78-149-8-254.as13285.net. [78.149.8.254]) by mx.google.com with ESMTPSA id uc3sm18440462wib.10.2014.04.21.14.49.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 14:49:32 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: linux-mmc@vger.kernel.org Cc: Russell King , Chris Ball , Ulf Hansson , linux-kernel@vger.kernel.org, agross@quicinc.com, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH RFC 11/12] mmc: mmci: Add Qcom variations to MCICommand register. Date: Mon, 21 Apr 2014 22:49:25 +0100 Message-Id: <1398116965-31732-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398116624-31052-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1398116624-31052-1-git-send-email-srinivas.kandagatla@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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 From: Srinivas Kandagatla Some bits which control Command Path State Machine (CPSM) are new in Qcom integration, so this patch adds support to those bits. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/mmci.c | 4 ++++ drivers/mmc/host/mmci.h | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2cd3a8f..8fcd8ef 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -910,6 +910,10 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) if (/*interrupt*/0) c |= MCI_CPSM_INTERRUPT; + if (host->hw_designer == AMBA_VENDOR_QCOM && + mmc_cmd_type(cmd) == MMC_CMD_ADTC) + c |= MCI_CSPM_QCOM_DATCMD; + host->cmd = cmd; mmci_writel(host, cmd->arg, MMCIARGUMENT); diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 0a6de1c..2ba0834 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -64,6 +64,13 @@ #define MCI_ST_ENCMD_COMPL (1 << 12) #define MCI_ST_NIEN (1 << 13) #define MCI_ST_CE_ATACMD (1 << 14) +/* Modified on Qualcomm Integrations */ +#define MCI_CSPM_QCOM_DATCMD (1 << 12) +#define MCI_CSPM_QCOM_MCIABORT (1 << 13) +#define MCI_CSPM_QCOM_CCSENABLE (1 << 14) +#define MCI_CSPM_QCOM_CCSDISABLE (1 << 15) +#define MCI_CSPM_QCOM_AUTO_CMD19 (1 << 16) +#define MCI_CSPM_QCOM_AUTO_CMD21 (1 << 21) #define MMCIRESPCMD 0x010 #define MMCIRESPONSE0 0x014