From patchwork Mon Jun 2 09:10:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4280591 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 9AE1C9F1D6 for ; Mon, 2 Jun 2014 09:10:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8EC9202EB for ; Mon, 2 Jun 2014 09:10:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD69B20158 for ; Mon, 2 Jun 2014 09:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753845AbaFBJKn (ORCPT ); Mon, 2 Jun 2014 05:10:43 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:61531 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776AbaFBJKS (ORCPT ); Mon, 2 Jun 2014 05:10:18 -0400 Received: by mail-wi0-f181.google.com with SMTP id n15so4222857wiw.8 for ; Mon, 02 Jun 2014 02:10:17 -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=hdfYnQbaNMK54awd4NRAh1YPQf2V83cXKTYu8CK4NCo=; b=XYfZJPvdl/4FvD4Jf4ZLpoLGqfUA2/pJVyWGEu4E/xHBzDsFT3ecUyj2bNV8y0Sg2w RskYIJs+eBmHVl/zQP1jcy+Vsy+SG3mZV9sT3/uFhDjuQsByx/2krBJDiJ6zIWUaLEbo zt7N4o6BBbGOlQxp2orFl5B5hGmlqXjYHqgqfa4hM5TIvpQ2vYWKv3M7Nj1aKy5mbYcd J29S8H0RgIozhlGjv/GxMsosc2W/aTyGtH4njVfdNS4/Ux26FPeVNBaL5VTNG+PfZ6Uy YxRkcBh9g5ww5MgcEQ7xCCOM1UzHgM7HQ9bH7l62zHTMLIWTNu4jKQHtZbWQyXOd/rkA xa6Q== X-Gm-Message-State: ALoCoQkWydrqemnjzr1woK15QpLNwroLDTdF9dAnQfHgBXJ2qPBqdMalb9MbxQlFBNyHgyaPPEVD X-Received: by 10.194.5.5 with SMTP id o5mr47671667wjo.16.1401700217224; Mon, 02 Jun 2014 02:10:17 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-149-12-106.as13285.net. [78.149.12.106]) by mx.google.com with ESMTPSA id ds9sm28021970wib.20.2014.06.02.02.10.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Jun 2014 02:10:16 -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 v6 12/12] mmc: mmci: Add Qualcomm Id to amba id table Date: Mon, 2 Jun 2014 10:10:13 +0100 Message-Id: <1401700213-11917-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401699818-11329-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1401699818-11329-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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 08ff8d2..fa851d5 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -190,6 +190,23 @@ 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, + .clkreg_enable = MCI_QCOM_CLK_FLOWENA | + MCI_QCOM_CLK_SELECT_IN_FBCLK, + .clkreg_8bit_bus_enable = MCI_QCOM_CLK_WIDEBUS_8, + .datactrl_mask_ddrmode = MCI_QCOM_CLK_SELECT_IN_DDR_MODE, + .data_cmd_enable = MCI_QCOM_CSPM_DATCMD, + .blksz_datactrl4 = true, + .datalength_bits = 24, + .pwrreg_powerup = MCI_PWR_UP, + .f_max = 208000000, + .explicit_mclk_control = true, + .qcom_fifo = true, +}; + static int mmci_card_busy(struct mmc_host *mmc) { struct mmci_host *host = mmc_priv(mmc); @@ -1831,6 +1848,12 @@ static struct amba_id mmci_ids[] = { .mask = 0xf0ffffff, .data = &variant_ux500v2, }, + /* Qualcomm variants */ + { + .id = 0x00051180, + .mask = 0x000fffff, + .data = &variant_qcom, + }, { 0, 0 }, };