From patchwork Tue Dec 2 23:42:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 5425291 Return-Path: X-Original-To: patchwork-linux-omap@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 CE45EBEEA8 for ; Tue, 2 Dec 2014 23:44:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8A022034B for ; Tue, 2 Dec 2014 23:44:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDD2320295 for ; Tue, 2 Dec 2014 23:44:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933424AbaLBXnF (ORCPT ); Tue, 2 Dec 2014 18:43:05 -0500 Received: from mail-ig0-f173.google.com ([209.85.213.173]:33873 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933284AbaLBXnD (ORCPT ); Tue, 2 Dec 2014 18:43:03 -0500 Received: by mail-ig0-f173.google.com with SMTP id r2so15920757igi.12 for ; Tue, 02 Dec 2014 15:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UJSfp78SSyyYPgsgLf/Uf0EgW3nXB2pKEUkUq09uuuM=; b=CilLLMRpJpQL6tYd0C/cSpPCvJ4hTlT0SrE+5l7HYQARyV7AhKD9lF+tzjZP4bZSxO dJ9MBAJ1hVRYw+ljcaBqguLX0FDqwtAxL2yLDGRp04jKOFJqKiEjZc5tJRNmyf4F8w1C 56SYvQPDR2DvIfT0+ahoZzOTVMIg8/IVVe4Rg= 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=UJSfp78SSyyYPgsgLf/Uf0EgW3nXB2pKEUkUq09uuuM=; b=Am3qSlvdkphHpW1tuq4OpsPyWsWPhedkzKE0Q9LjqBYnn13sgd8IhIcM8NWoYXWREA Q+BMVehSKxFzbqNjzalRGkbYcHo+8KegeDkB1HK8sx/Rn9ow37lWT3VFz/PPyc8O249c CCacPVb/3sdxmH/sYkLLpqQIbtiwDfuYIDAXCYuzA6Ys1MPlajelG6QtZ8NXTUI+Dy9d Bt4rG3gjjc+v9X6p69BWUIo7I2E0a0jpVyS0zbQG+01IZu83kRKuKZslSq4Y0MwvJQPb cNQzGQ44Vtq3yUbi78j99OqbpQbLY5BsEDoC3nkzVt5C4JbOJM42z07FS2/sZJib62Yc e6WA== X-Gm-Message-State: ALoCoQl6MmQln5lIiukyG1fc7S3OV3fYm3/jFIDaCK18LVuhK8+DSfEhPOaeNyBwtkNSw5NcI4oI X-Received: by 10.107.3.7 with SMTP id 7mr2093641iod.8.1417563782407; Tue, 02 Dec 2014 15:43:02 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id u33sm11856530ioi.6.2014.12.02.15.43.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Dec 2014 15:43:01 -0800 (PST) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Cc: Alim Akhtar , Sonny Rao , Andrew Bresticker , Heiko Stuebner , Doug Anderson , tony@atomide.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/4] ARM: OMAP2+: Make sure pandora_wl1251_init_card() applies to SDIO only Date: Tue, 2 Dec 2014 15:42:44 -0800 Message-Id: <1417563767-32181-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1417563767-32181-1-git-send-email-dianders@chromium.org> References: <1417563767-32181-1-git-send-email-dianders@chromium.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 In preparation for having init_card() called for all card types (not just SDIO), change pandora_wl1251_init_card() so it checks whether the card type is SDIO. Signed-off-by: Doug Anderson Acked-by: Tony Lindgren --- Changes in v5: - Split fixup to pandora_wl1251_init_card() into its own patch. Changes in v3: None Changes in v2: None arch/arm/mach-omap2/board-omap3pandora.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 7f17087..969e100 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -254,12 +254,14 @@ static void pandora_wl1251_init_card(struct mmc_card *card) * We have TI wl1251 attached to MMC3. Pass this information to * SDIO core because it can't be probed by normal methods. */ - card->quirks |= MMC_QUIRK_NONSTD_SDIO; - card->cccr.wide_bus = 1; - card->cis.vendor = 0x104c; - card->cis.device = 0x9066; - card->cis.blksize = 512; - card->cis.max_dtr = 20000000; + if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) { + card->quirks |= MMC_QUIRK_NONSTD_SDIO; + card->cccr.wide_bus = 1; + card->cis.vendor = 0x104c; + card->cis.device = 0x9066; + card->cis.blksize = 512; + card->cis.max_dtr = 20000000; + } } static struct omap2_hsmmc_info omap3pandora_mmc[] = {