From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751747Ab2HVEGE (ORCPT ); Wed, 22 Aug 2012 00:06:04 -0400 Received: from mail-yw0-f74.google.com ([209.85.213.74]:46244 "EHLO mail-yw0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308Ab2HVEF5 (ORCPT ); Wed, 22 Aug 2012 00:05:57 -0400 From: Doug Anderson To: linux-mmc@vger.kernel.org Cc: Olof Johansson , Alim Akhtar , Thomas P Abraham , Chris Ball , Will Newton , Seungwon Jeon , Jaehoon Chung , James Hogan , linux-kernel@vger.kernel.org, Linus Walleij , Ulf Hansson , Adrian Hunter , Doug Anderson Subject: [PATCH 2/2] mmc: dw_mmc: Add a DISABLE_MMC quirk that sets the core mmc cap Date: Tue, 21 Aug 2012 21:05:18 -0700 Message-Id: <1345608318-15347-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1345608318-15347-1-git-send-email-dianders@chromium.org> References: <1345608318-15347-1-git-send-email-dianders@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some systems we need a way to disable MMC card support in a MMC/SD card slot. Add support in the dw_mmc to support this. Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 3 +++ include/linux/mmc/dw_mmc.h | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index af40d22..09111bf 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1810,6 +1810,9 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (host->pdata->quirks & DW_MCI_QUIRK_HIGHSPEED) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; + if (host->pdata->quirks & DW_MCI_QUIRK_DISABLE_MMC) + mmc->caps2 |= MMC_CAP2_NO_MMC; + if (mmc->caps2 & MMC_CAP2_POWEROFF_NOTIFY) mmc->power_notify_type = MMC_HOST_PW_NOTIFY_SHORT; else diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7a7ebd3..5eaa9b9 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -201,6 +201,8 @@ struct dw_mci_dma_ops { #define DW_MCI_QUIRK_HIGHSPEED BIT(2) /* Unreliable card detection */ #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) +/* Only support SD cards, not MMC */ +#define DW_MCI_QUIRK_DISABLE_MMC BIT(4) struct dma_pdata; -- 1.7.7.3