From patchwork Mon Apr 21 21:48:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4026541 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 87793C0DA2 for ; Mon, 21 Apr 2014 21:49:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEEE020357 for ; Mon, 21 Apr 2014 21:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA27B2035E for ; Mon, 21 Apr 2014 21:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754919AbaDUVs7 (ORCPT ); Mon, 21 Apr 2014 17:48:59 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:59018 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754906AbaDUVsw (ORCPT ); Mon, 21 Apr 2014 17:48:52 -0400 Received: by mail-wg0-f50.google.com with SMTP id x13so3084356wgg.21 for ; Mon, 21 Apr 2014 14:48:49 -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=WvXVuRCTz+gz9FCss+PfntUvCDFPsCiTSaNr9QKrGnI=; b=h9xzd/ShicC+AZzZSXGe0HX94zm1G0Wqkl882J8Ll9AjEPRxIoPiyp1w68vh/Z/MCC 89WFFBQu8HG/jS9q6utaIKGOop1RfWphMcD1dTPFJO2Kn4AVNgvtoupdePgcVJZqVkcs UoU8KggzMxrS6EjGi1ht7Tpeb/HEkjXCHFKrZH8fyEasRuy2xpzIR6evcJILXgGmMHnS WH+4IEYCdeBGgzGQs3GmhZN2i1lQAhXOZJyDk/5qwcce7qWLjB8pieK6zkoB2EAUjCHs s8N8l8+1YEd/qJq5gPFonSAQsnzP/rHIiOtZGI8ZgZ7JLxUYny1PTkv+5Rltyo7xiYjO ZEvg== X-Gm-Message-State: ALoCoQmTEjZoYFRNxtotmYSzTbKaxKr6KNT9xVO1HkmyJXdzE0VcKGZuTKZUdipzCernx/23R2gA X-Received: by 10.194.89.168 with SMTP id bp8mr234056wjb.73.1398116929821; Mon, 21 Apr 2014 14:48:49 -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 jd2sm18438269wic.9.2014.04.21.14.48.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 14:48:49 -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 08/12] mmc: mmci: move ST specific register extensions access under condition. Date: Mon, 21 Apr 2014 22:48:42 +0100 Message-Id: <1398116922-31556-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 This patch moves some of the ST specific register extensions access under condition, so that other SOCs like Qualcomm or ARM would not a side effect of writing to those reserved/different purpose bits. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/mmci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2dc7581..179abfb 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -270,7 +270,8 @@ static void mmci_write_pwrreg(struct mmci_host *host, u32 pwr) static void mmci_write_datactrlreg(struct mmci_host *host, u32 datactrl) { /* Keep ST Micro busy mode if enabled */ - datactrl |= host->datactrl_reg & MCI_ST_DPSM_BUSYMODE; + if (host->hw_designer == AMBA_VENDOR_ST) + datactrl |= host->datactrl_reg & MCI_ST_DPSM_BUSYMODE; if (host->datactrl_reg != datactrl) { host->datactrl_reg = datactrl; @@ -816,7 +817,8 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) mmci_write_clkreg(host, clk); } - if (host->mmc->ios.timing == MMC_TIMING_UHS_DDR50) + if (host->mmc->ios.timing == MMC_TIMING_UHS_DDR50 && + host->hw_designer == AMBA_VENDOR_ST) datactrl |= MCI_ST_DPSM_DDRMODE; /*