From patchwork Tue May 11 09:52:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 98682 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 o4B9qkH4023661 for ; Tue, 11 May 2010 09:52:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932450Ab0EKJwd (ORCPT ); Tue, 11 May 2010 05:52:33 -0400 Received: from mail.gmx.net ([213.165.64.20]:56672 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932441Ab0EKJwc (ORCPT ); Tue, 11 May 2010 05:52:32 -0400 Received: (qmail invoked by alias); 11 May 2010 09:52:30 -0000 Received: from p57BD1DCF.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.29.207] by mail.gmx.net (mp066) with SMTP; 11 May 2010 11:52:30 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX19HPeZm1RRHgbXb5ZJnpwdA0nGuHico8SkbUaRnb9 EM01+cN4OUrfiE Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OBm8h-00022l-At; Tue, 11 May 2010 11:52:35 +0200 Date: Tue, 11 May 2010 11:52:35 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Ian Molton , Samuel Ortiz , linux-mmc@vger.kernel.org Subject: [PATCH 2/3] 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]); Tue, 11 May 2010 09:52:47 +0000 (UTC) diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index dafa988..d977982 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -106,6 +106,7 @@ 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; + 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); };