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: Doug Anderson X-Patchwork-Id: 5425311 Return-Path: X-Original-To: patchwork-linux-arm@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 3915D9F30B for ; Tue, 2 Dec 2014 23:46:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FC7520295 for ; Tue, 2 Dec 2014 23:46:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8949F2028D for ; Tue, 2 Dec 2014 23:46:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xvx6T-0000OD-9V; Tue, 02 Dec 2014 23:43:33 +0000 Received: from mail-ie0-x22e.google.com ([2607:f8b0:4001:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xvx6J-0000Ju-Ox for linux-arm-kernel@lists.infradead.org; Tue, 02 Dec 2014 23:43:24 +0000 Received: by mail-ie0-f174.google.com with SMTP id rl12so12682308iec.33 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=OBz/qD//nLQGZrvOPYlV/AUd7o2eP7zTW3si60Rt4sq/MZk6rexosF79wyciqLxozJ PbEo3b3+FPx2C+HaW1SCnLXanW8gmLT0O64UULf3sT4lN+4/llpul4MfyjJ4QUky8zKE 2xN7u0/oLanm5zkMC1MtyJoUuGv2MRCAwXGm9YRZHeVCpqoFcYR/tRMy5d9iAkydgBux j5c25npgdWxq8DoNukKRtO4+L7kIKou0dK7ZPPDel5u2VtWXJaEfK1xtI6Bs/wH4uV/j Ipw6i+uf8zmclfzQWSDwW7EqFpmdFqYSJkFeEy6uQYY7I9ZKnQF6RBv2GwG3mR8VqNj/ i8CA== X-Gm-Message-State: ALoCoQltNWrFJptOa6yLzEu99ongKn7WnO+6AwC8JkohfaulQ2JmfVQNLQMjlu3zEW9Dt/lrSM0K 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141202_154323_851067_6ECB33B9 X-CRM114-Status: GOOD ( 10.76 ) X-Spam-Score: -0.8 (/) Cc: linux@arm.linux.org.uk, Heiko Stuebner , Andrew Bresticker , Doug Anderson , linux-kernel@vger.kernel.org, tony@atomide.com, Alim Akhtar , linux-omap@vger.kernel.org, Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_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 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[] = {