From patchwork Fri Jul 1 23:13:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 939502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p61NDlFp031427 for ; Fri, 1 Jul 2011 23:13:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757869Ab1GAXNr (ORCPT ); Fri, 1 Jul 2011 19:13:47 -0400 Received: from oproxy8-pub.bluehost.com ([69.89.22.20]:53966 "HELO oproxy8-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757921Ab1GAXNr (ORCPT ); Fri, 1 Jul 2011 19:13:47 -0400 Received: (qmail 23184 invoked by uid 0); 1 Jul 2011 23:13:46 -0000 Received: from unknown (HELO box284.bluehost.com) (69.89.31.84) by oproxy8.bluehost.com with SMTP; 1 Jul 2011 23:13:46 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=boundarydevices.com; h=From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=A+7TNQUu1aZZ8PKg6Xt1iU8XjbC0739pzw8SRfT346FCby796/iOlZ5hcC9jxVQIklmfNUaz6CySpQcb4pLOLyirkJeRk888jgRKKVHu5Oqo46YLSGyzAM+qf5uKgsTR; Received: from [70.96.116.236] (helo=localhost) by box284.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Qcmu9-0001Z0-8D; Fri, 01 Jul 2011 17:13:45 -0600 Received: from tkisky by localhost with local (Exim 4.71) (envelope-from ) id 1Qcmu7-0008WD-BT; Fri, 01 Jul 2011 16:13:43 -0700 From: Troy Kisky To: w.sang@pengutronix.de Cc: Hong-Xing.Zhu@freescale.com, cjb@laptop.org, linux-mmc@vger.kernel.org, Troy Kisky Subject: [PATCH 2/2] mmc: sdhci-esdhc: OR mmc->caps with platform data caps Date: Fri, 1 Jul 2011 16:13:39 -0700 Message-Id: <1309562019-32707-2-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1309562019-32707-1-git-send-email-troy.kisky@boundarydevices.com> References: <1309562019-32707-1-git-send-email-troy.kisky@boundarydevices.com> X-Identified-User: {1412:box284.bluehost.com:boundar4:boundarydevices.com} {sentby:smtp auth 70.96.116.236 authed with troy.kisky@boundarydevices.com} Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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]); Fri, 01 Jul 2011 23:13:48 +0000 (UTC) Signed-off-by: Troy Kisky --- arch/arm/plat-mxc/include/mach/esdhc.h | 5 +++++ drivers/mmc/host/sdhci-esdhc-imx.c | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/arch/arm/plat-mxc/include/mach/esdhc.h index 86003f4..9c0dd1d 100644 --- a/arch/arm/plat-mxc/include/mach/esdhc.h +++ b/arch/arm/plat-mxc/include/mach/esdhc.h @@ -22,5 +22,10 @@ struct esdhc_platform_data { unsigned int wp_gpio; unsigned int cd_gpio; + /* + * 4/8 wires and any additional host + * capabilities OR'd + */ + u32 caps; }; #endif /* __ASM_ARCH_IMX_ESDHC_H */ diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ad53041..c42ba83 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -261,6 +261,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd imx_data->cd_gpio = boarddata->cd_gpio; if (gpio_is_valid(boarddata->wp_gpio)) imx_data->wp_gpio = boarddata->wp_gpio; + host->mmc->caps |= boarddata->caps; } if (imx_data->wp_gpio != -EINVAL) { err = gpio_request_one(imx_data->wp_gpio, GPIOF_IN, "ESDHC_WP");