From patchwork Wed May 28 13:46:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4255511 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 C9E2ABF90B for ; Wed, 28 May 2014 13:49:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50A4220131 for ; Wed, 28 May 2014 13:49:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDD8520279 for ; Wed, 28 May 2014 13:49:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426AbaE1Nt0 (ORCPT ); Wed, 28 May 2014 09:49:26 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:58520 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753932AbaE1Nq0 (ORCPT ); Wed, 28 May 2014 09:46:26 -0400 Received: by mail-wi0-f177.google.com with SMTP id f8so3763771wiw.16 for ; Wed, 28 May 2014 06:46:23 -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=S+6xdpMA0hkLT6VTb+jWhz0YSGOc1/VoYxfLURA2XJo=; b=WSv49dimwlNkggfXp2u13TwXfyw3R+vH5c5/eZw7/v4EG35Rqv62mAIgVlHAQvkhRh fJgq8y+QXRGl+4TPXLcyl8pkoxpoeAJd8FqUUcjbnD9PxJy5CxUTn6rc8iFbPkk2JjHE 3P8ljWHk4BzgkO8X9ZKfkx7yDQMkvp1asmqMdjNGqYq1hU9l+/1ln5Fg32h4YByhxfUb l+Hjqvr7U3GjTZQPUkohmJ2j3TDNoO1NSPe14zXmQWd8P+yZ9finYUKUw/+Lc6xdQPQ+ PJ9o6dzyrlxwQyKFDzh2/txNblLQcdcud5Z8J0krp2Z3xfOVP2ahKk6EB4I0nCw+qSCL q6bQ== X-Gm-Message-State: ALoCoQkc5vvn9Y9vXXgYUKUwN+aiVr629oDYjmL5oQfHQVMUZXrNfUnWkk9lwRyMCDn/wkT9zavD X-Received: by 10.180.212.48 with SMTP id nh16mr49304830wic.49.1401284783020; Wed, 28 May 2014 06:46:23 -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 f6sm16987830wiy.19.2014.05.28.06.46.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 May 2014 06:46:22 -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 v4 03/13] mmc: mmci: Add Qualcomm Id to amba id table Date: Wed, 28 May 2014 14:46:19 +0100 Message-Id: <1401284779-16563-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401284608-16428-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1401284608-16428-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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a38e714..86f25a9 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -160,6 +160,14 @@ 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, + .pwrreg_powerup = MCI_PWR_UP, +}; + static int mmci_card_busy(struct mmc_host *mmc) { struct mmci_host *host = mmc_priv(mmc); @@ -1750,6 +1758,12 @@ static struct amba_id mmci_ids[] = { .mask = 0xf0ffffff, .data = &variant_ux500v2, }, + /* Qualcomm variants */ + { + .id = 0x00051180, + .mask = 0x000fffff, + .data = &variant_qcom, + }, { 0, 0 }, };