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: 31273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 870D4203C2 for ; Mon, 2 Jun 2014 09:10:55 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id fp1sf15020642pdb.6 for ; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Lk/Q9McFwmOI172IaZmtp3XpHgF2XTBlkitvJrmop+A=; b=Ehc4vN/vgFQ+ql8x4DhcFfQQQZBuAN93jauf1vNaoYxQbuUHWPCjhuNr00GTj7qW+5 1hSChZewC4B/7rujBTTV4PdKH++dfnBbk4BKzvfBK2+YabcMmQSsK3QgiLtmSzFBaxia OCmpLhbXe+vE++ZUB9oKIk4kKEsHQY7T7XFXBHyrKCe3hPMyQ9VRLkgSvUCpYddfVBzV 5E0SKCvo7dJL3HOE6+/4s/iPqjhWRD00ckrtJbfJyM89NqxnxrvFzEukzATr3+ls452x 43+Be+1zB3wNAZ0ZIip9pULJmAaUGGWfukZ9B1V7Kajd8eCb/4lF4z6OtjgKZRmTra5Y ldTw== X-Gm-Message-State: ALoCoQn2tqoTouq9tnkCQf+DoiiuWY6VGWyP8FYXVsAtbaqZIiK91wPiqFXD/96MWwESTgYm/oHK X-Received: by 10.68.183.197 with SMTP id eo5mr12527050pbc.9.1401700254786; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.134 with SMTP id t6ls1914464qgd.20.gmail; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) X-Received: by 10.220.253.132 with SMTP id na4mr134845vcb.39.1401700254656; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id fe3si7591684vec.43.2014.06.02.02.10.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 02:10:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id id10so4728753vcb.6 for ; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) X-Received: by 10.52.92.100 with SMTP id cl4mr32402vdb.48.1401700254325; Mon, 02 Jun 2014 02:10:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp82719vcb; Mon, 2 Jun 2014 02:10:53 -0700 (PDT) X-Received: by 10.68.135.42 with SMTP id pp10mr39205191pbb.58.1401700253379; Mon, 02 Jun 2014 02:10:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fb5si15023164pbd.178.2014.06.02.02.10.52; Mon, 02 Jun 2014 02:10:52 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753862AbaFBJKo (ORCPT + 28 others); Mon, 2 Jun 2014 05:10:44 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:35489 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbaFBJKS (ORCPT ); Mon, 2 Jun 2014 05:10:18 -0400 Received: by mail-wg0-f50.google.com with SMTP id x12so4852482wgg.9 for ; Mon, 02 Jun 2014 02:10:17 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 }, };