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: 4712511 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 59F709F319 for ; Tue, 12 Aug 2014 12:05:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 411442014A for ; Tue, 12 Aug 2014 12:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49193200E9 for ; Tue, 12 Aug 2014 12:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979AbaHLMFl (ORCPT ); Tue, 12 Aug 2014 08:05:41 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:50317 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952AbaHLMFj (ORCPT ); Tue, 12 Aug 2014 08:05:39 -0400 Received: by mail-pd0-f179.google.com with SMTP id v10so6622123pde.10 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=DvT5af5PRfq3W8U5PFW3YissJc/nNgAWxE9qSKxDNgUInoTZ0ntRsGAaorhGluL+dJ qGUqsZ32Tjbo5FRQSEhf/UQ1Kijc+ZYPGB6bNPU4CWBMvmKvGpE/NF8X86PkjgMw8hhd Z5aJx8lcmmCfdj2DJ2mwlaFWYN6kztXUks3oQdo+5E5cYqHQ3ZD66ZX4/Ip6KJBhr7Mx j9dwHvgT1NXI+Ra5fza+90SI5Wc/bgYtr6M91lS/JPwuJuk98y2uatIlGbWaPO9Sa/+m IX9XPVOpreqFu4jmxrxDKn0ubA+rdE2B7r8q2QHzkyMm39URbNL394mDHJcLrOg3Ha1W bLww== X-Gm-Message-State: ALoCoQksrNnJbShrPId0WpI/tZ7Q6vbkT95i+/SmBZg6iGyjhZGBQgSZnKhvvpBbKfwhZEBRNgUI 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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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;