From patchwork Thu Jun 5 21:14:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4308911 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 4504ABEECB for ; Thu, 5 Jun 2014 21:15:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A96B20256 for ; Thu, 5 Jun 2014 21:15:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F82A20268 for ; Thu, 5 Jun 2014 21:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752502AbaFEVPF (ORCPT ); Thu, 5 Jun 2014 17:15:05 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59073 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821AbaFEVPD (ORCPT ); Thu, 5 Jun 2014 17:15:03 -0400 Received: from wuerfel.lan (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue005) with ESMTP (Nemesis) id 0LeQLR-1WRIo72prh-00qBlQ; Thu, 05 Jun 2014 23:14:54 +0200 From: Arnd Bergmann To: Chris Ball Cc: Ulf Hansson , linux-mmc@vger.kernel.org, Arnd Bergmann , linux-omap@vger.kernel.org, Jarkko Nikula Subject: [PATCH 3/4] mmc: omap: don't select TPS65010 Date: Thu, 5 Jun 2014 23:14:40 +0200 Message-Id: <1402002881-1986640-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402002881-1986640-1-git-send-email-arnd@arndb.de> References: <1402002881-1986640-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:0u8z5PHVF/J/bCHvD8+hausG8odNomjOFUOt+HW2jrs YdnhKw6tcsfpcxwuPKCfk9xZr/n8s46puJsTLd+WaZAroQpYz3 qCg4zA93RaIXMZx3tQZDlT74jmfkdivR6+PqGBep+7B873fuur SX01m8wVMfOF9NuK0YFIrGZvOS+q3P064hqk2CFK4W4vKo5Icc WPKOHzmxce3PbKNxytm9VZEQZ/Mwmo2xLfF2SaiohDXhrPCW5u rtdjDCLYP/JtWJk3tDEWjAT03ULqsv0ckXbJiLjflp52nHZxly dzLuGphMHNWdNvNP95sw6p0R6LziGyx02M3HhvYg/unuSHtezR HsFjpyJgZagg9yElYdjXpM5KwMqR6o6UYs+0WNNid 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 The MMC host driver should not select the pmic driver, since that may have other dependencies, notably i2c in this case. It's not clear what the exact requirement of the driver is, but to preserve the behavior, this patch changes the 'select' into 'depends on', meaning you now have to turn on TPS65010 explicitly and then MMC_OMAP. Found during randconfig build testing. Signed-off-by: Arnd Bergmann Cc: linux-omap@vger.kernel.org Cc: Jarkko Nikula --- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index cdf21cc..adffe0e 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -295,7 +295,7 @@ config MMC_MOXART config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP - select TPS65010 if MACH_OMAP_H2 + depends on TPS65010 || !MACH_OMAP_H2 help This selects the TI OMAP Multimedia card Interface. If you have an OMAP board with a Multimedia Card slot,