From patchwork Tue Aug 12 12:05:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4712521 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 BDCD2C0338 for ; Tue, 12 Aug 2014 12:05:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8980E200E9 for ; Tue, 12 Aug 2014 12:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45F4220160 for ; Tue, 12 Aug 2014 12:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752977AbaHLMFl (ORCPT ); Tue, 12 Aug 2014 08:05:41 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:51044 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752951AbaHLMFj (ORCPT ); Tue, 12 Aug 2014 08:05:39 -0400 Received: by mail-pa0-f44.google.com with SMTP id eu11so12985504pac.3 for ; Tue, 12 Aug 2014 05:05:38 -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=njLkLlxtnf0uXp8bzTO/RTp2Hjlb5YhzlnkQFNMPCGU=; b=eeX9Qmr0Pws4zeQF6SgGwdLZqQZR1mZKgeBa49je0lnGAg2UQX54p+vlMBWr66iu7B 81FqW7GMz1r8K+T/aZBpLhN/MvckJkZT1VU6PdRo1m33UyErFb/sm2OGsvbchOXQ9wto M2+adFF8nPdEd2e8dAz/suV79jv724auH8ATDnVH5jIpRV1G3UQN/EtvaIHkuuqkPsgU 2SFL/4xulYsGUM/QzM1TLLi8RR11c+G/r1N/PdKZBl7+LbEub8TIslzQoKvxwMKMJ/nt kG57dPPn1O6KTvS18wnUHObrYdVAES5UQ+8WTwsjmEbiu5/Ppw4gga33xDDJV7mnWroh GmLw== X-Gm-Message-State: ALoCoQm9vg8G5cxQ1NvEmQeDNnspxCCMXSTdZQwpJzdYjFOFiM3R0QRBlpOzc3D2UKr4GxNNkUIa X-Received: by 10.70.108.194 with SMTP id hm2mr3986928pdb.115.1407845138715; Tue, 12 Aug 2014 05:05:38 -0700 (PDT) Received: from localhost.localdomain ([117.198.92.185]) by mx.google.com with ESMTPSA id gy2sm14406354pbb.50.2014.08.12.05.05.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 05:05:37 -0700 (PDT) From: Srinivas Kandagatla X-Google-Original-From: Srinivas Kandagatla To: linux-mmc@vger.kernel.org Cc: Linus Walleij , Chris Ball , Ulf Hansson , Russell King , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH RFC 5/5] mmc: mmci: move ST specific sdio setup under a condition Date: Tue, 12 Aug 2014 13:05:27 +0100 Message-Id: <1407845127-8448-1-git-send-email-srinivas.kandadgatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407844950-8072-1-git-send-email-srinivas.kandadgatla@linaro.org> References: <1407844950-8072-1-git-send-email-srinivas.kandadgatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB, 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 This patch moves ST specific sdio setup under a vendor id condition, this will ensure that the ST specfic setup is not done on other vendor like Qualcomm. Originally the issue was detected while testing WLAN ath6kl on IFC6410 board with APQ8064 SOC. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/mmci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 848e2bb..1783be7 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -828,7 +828,8 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) * otherwise the transfer will not start. The threshold * depends on the rate of MCLK. */ - if (data->flags & MMC_DATA_WRITE && + if (host->hw_designer == AMBA_VENDOR_ST && + data->flags & MMC_DATA_WRITE && (host->size < 8 || (host->size <= 8 && host->mclk > 50000000))) clk = host->clk_reg & ~variant->clkreg_enable;