From patchwork Wed May 19 18:37:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 101019 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4JIZxwr009724 for ; Wed, 19 May 2010 18:37:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753379Ab0ESShZ (ORCPT ); Wed, 19 May 2010 14:37:25 -0400 Received: from mail.gmx.net ([213.165.64.20]:33882 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753363Ab0ESShY (ORCPT ); Wed, 19 May 2010 14:37:24 -0400 Received: (qmail invoked by alias); 19 May 2010 18:37:16 -0000 Received: from p57BD1EDF.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.30.223] by mail.gmx.net (mp013) with SMTP; 19 May 2010 20:37:16 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX187GFRba447DGv04iiw9gC08Kubgx9SFI/x6eBPgl Kz6X8LXwMGqMN7 Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OEo9A-0002Kl-MX; Wed, 19 May 2010 20:37:36 +0200 Date: Wed, 19 May 2010 20:37:36 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Ian Molton , Samuel Ortiz , linux-mmc@vger.kernel.org, Magnus Damm , Andrew Morton Subject: [PATCH 2/2] sh: allow platforms to specify SD-card supported voltages In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 19 May 2010 18:37:25 +0000 (UTC) diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 7970fe8..d9e4701 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -106,8 +106,10 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev) mmc_data->hclk = clk_get_rate(priv->clk); mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; - if (p) + if (p) { mmc_data->flags = p->tmio_flags; + mmc_data->ocr_mask = p->tmio_ocr_mask; + } if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) { priv->param_tx.slave_id = p->dma_slave_tx; diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h index c7b47f8..4906780 100644 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ b/include/linux/mfd/sh_mobile_sdhi.h @@ -1,10 +1,13 @@ #ifndef __SH_MOBILE_SDHI_H__ #define __SH_MOBILE_SDHI_H__ +#include + struct sh_mobile_sdhi_info { int dma_slave_tx; int dma_slave_rx; unsigned long tmio_flags; + u32 tmio_ocr_mask; /* available MMC voltages */ void (*set_pwr)(struct platform_device *pdev, int state); };