From patchwork Fri May 23 12:51:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4232631 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 EC9F4BF90B for ; Fri, 23 May 2014 12:56:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 36464202C8 for ; Fri, 23 May 2014 12:56:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C1A2201DC for ; Fri, 23 May 2014 12:56:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbaEWMvW (ORCPT ); Fri, 23 May 2014 08:51:22 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33002 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752371AbaEWMvU (ORCPT ); Fri, 23 May 2014 08:51:20 -0400 Received: by mail-wi0-f171.google.com with SMTP id cc10so783199wib.4 for ; Fri, 23 May 2014 05:51:19 -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=xGpj4OS37vc7XCZGNa2pC0TX7AtzwAZ6ugtGPtOt4Rc=; b=InZOyJnoly6Rsm8muJ5CpFVqY5VDqtO8n2ivq35ySq5fizXNMgfBEJV5Y2px367AWy 5nL25atFqPLjeWL8FnHgjbydLY6K4y9GMRsNwUhlqXcLW53k9OCaU0J3sBP0mZiFsxVQ eLgImvdf8XdYegoHhn/4OTSXmULQO3xn4ZACO1Wh8ibItL7B6Ti68ciaqkQILbGyu0fq 35k5QDF66zFyyhSEKLvy/3eD50jQ2+Wr9gR/5tBJZgvIaIWw5M1pByibaiAxy6NJDVE5 Z42ZY3zV/QpEM8h5BVKli+xy0Uh/ze6WDmlrjxtm4q+Mam4Q2M48Ed1NxO0lOa5jFA8/ ZcRQ== X-Gm-Message-State: ALoCoQm5SGZg3a7NVeQb7tuot3baMhfZGlGtTAM8U9nkVz7kFCxulm3ZqKinPZzXuLFQFEpAkOp2 X-Received: by 10.180.91.114 with SMTP id cd18mr3158282wib.28.1400849479285; Fri, 23 May 2014 05:51:19 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-149-4-211.as13285.net. [78.149.4.211]) by mx.google.com with ESMTPSA id l4sm2819689wiy.0.2014.05.23.05.51.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 May 2014 05:51:18 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Russell King , Ulf Hansson , linux-mmc@vger.kernel.org Cc: Chris Ball , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linus.walleij@linaro.org, Srinivas Kandagatla Subject: [PATCH v3 03/13] mmc: mmci: Add Qualcomm Id to amba id table Date: Fri, 23 May 2014 13:51:14 +0100 Message-Id: <1400849474-7177-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400849362-7007-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1400849362-7007-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 adds a fake Qualcomm ID 0x00051180 to the amba_ids, as Qualcomm SDCC controller is pl180, but amba id registers read 0x0's. The plan is to remove SDCC driver totally and use mmci as the main SD controller driver for Qualcomm SOCs. Signed-off-by: Srinivas Kandagatla Reviewed-by: Linus Walleij --- drivers/mmc/host/mmci.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a38e714..7bdf4d3 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -160,6 +160,15 @@ static struct variant_data variant_ux500v2 = { .pwrreg_nopower = true, }; +static struct variant_data variant_qcom = { + .fifosize = 16 * 4, + .fifohalfsize = 8 * 4, + .clkreg = MCI_CLK_ENABLE, + .datalength_bits = 24, + .blksz_datactrl4 = true, + .pwrreg_powerup = MCI_PWR_UP, +}; + static int mmci_card_busy(struct mmc_host *mmc) { struct mmci_host *host = mmc_priv(mmc); @@ -1750,6 +1759,12 @@ static struct amba_id mmci_ids[] = { .mask = 0xf0ffffff, .data = &variant_ux500v2, }, + /* Qualcomm variants */ + { + .id = 0x00051180, + .mask = 0x000fffff, + .data = &variant_qcom, + }, { 0, 0 }, };