Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932954AbaD2IVO (ORCPT ); Tue, 29 Apr 2014 04:21:14 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:49582 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932884AbaD2IVL (ORCPT ); Tue, 29 Apr 2014 04:21:11 -0400 From: srinivas.kandagatla@linaro.org To: Russell King , linux-mmc@vger.kernel.org Cc: Chris Ball , Ulf Hansson , linux-kernel@vger.kernel.org, agross@quicinc.com, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v1 10/11] mmc: mmci: Add Qcom variations to MCICommand register. Date: Tue, 29 Apr 2014 09:21:02 +0100 Message-Id: <1398759662-13381-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398759492-12970-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1398759492-12970-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 da135c0..def1b19 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -901,6 +901,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 -- 1.7.9.5 -- 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/