From patchwork Thu May 5 11:51:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 756642 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p45BqMP4019274 for ; Thu, 5 May 2011 11:52:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753245Ab1EELwU (ORCPT ); Thu, 5 May 2011 07:52:20 -0400 Received: from smtp.nokia.com ([147.243.128.24]:62722 "EHLO mgw-da01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753170Ab1EELwT (ORCPT ); Thu, 5 May 2011 07:52:19 -0400 Received: from nokia.com (localhost [127.0.0.1]) by mgw-da01.nokia.com (Switch-3.4.4/Switch-3.4.3) with ESMTP id p45BqGBD024966; Thu, 5 May 2011 14:52:16 +0300 Received: from localhost.localdomain ([[172.21.24.109]]) by mgw-da01.nokia.com with RELAY id p45BpO75023786 ; Thu, 5 May 2011 14:52:13 +0300 From: Adrian Hunter To: Tony Lindgren Cc: Madhusudhan Chikkature , linux-omap Mailing List , linux-mmc Mailing List , linux-arm Mailing List , Jarkko Lavinen , Adrian Hunter Subject: [PATCH 15/22] OMAP: hsmmc: Do not mux the slot if non default muxing is already done Date: Thu, 5 May 2011 14:51:15 +0300 Message-Id: <1304596282-4095-16-git-send-email-adrian.hunter@nokia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> References: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 05 May 2011 11:52:22 +0000 (UTC) From: Jarkko Lavinen Allow the bootloader do all the muxing. Signed-off-by: Jarkko Lavinen Signed-off-by: Adrian Hunter --- arch/arm/mach-omap2/hsmmc.c | 3 ++- arch/arm/mach-omap2/hsmmc.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index b2f30be..6b97fae 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -440,7 +440,8 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) pr_err("%s fails!\n", __func__); goto done; } - omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); + if (!hsmmcinfo->nomux) + omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); name = "omap_hsmmc"; ohl = omap_hsmmc_latency; diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index f119348..0f2a87e 100644 --- a/arch/arm/mach-omap2/hsmmc.h +++ b/arch/arm/mach-omap2/hsmmc.h @@ -19,6 +19,7 @@ struct omap2_hsmmc_info { bool power_saving; /* Try to sleep or power off when possible */ bool no_off; /* power_saving and power is not to go off */ bool vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */ + bool nomux; /* No default muxing for this slot */ int gpio_cd; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */ char *name; /* or NULL for default */