From patchwork Wed May 19 18:36:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 101018 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 o4JIZxwo009724 for ; Wed, 19 May 2010 18:36:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752994Ab0ESSgI (ORCPT ); Wed, 19 May 2010 14:36:08 -0400 Received: from mail.gmx.net ([213.165.64.20]:58827 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752961Ab0ESSgF (ORCPT ); Wed, 19 May 2010 14:36:05 -0400 Received: (qmail invoked by alias); 19 May 2010 18:35:50 -0000 Received: from p57BD1EDF.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.30.223] by mail.gmx.net (mp024) with SMTP; 19 May 2010 20:35:50 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1/+mXlRnSn+4cnIiSqodsaoYRGO2uZAyYrwYe6lp0 BYJakzN3W9c5We Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OEo7k-0002KY-UU; Wed, 19 May 2010 20:36:08 +0200 Date: Wed, 19 May 2010 20:36:08 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Ian Molton , Samuel Ortiz , linux-mmc@vger.kernel.org, Andrew Morton Subject: [PATCH 2/3 v2] mfd: pass platform flags down to the tmio_mmc driver 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:36:08 +0000 (UTC) diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index dafa988..7970fe8 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -106,6 +106,8 @@ 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) + mmc_data->flags = p->tmio_flags; 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 c305461..c7b47f8 100644 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ b/include/linux/mfd/sh_mobile_sdhi.h @@ -4,6 +4,7 @@ struct sh_mobile_sdhi_info { int dma_slave_tx; int dma_slave_rx; + unsigned long tmio_flags; void (*set_pwr)(struct platform_device *pdev, int state); };