From patchwork Wed May 19 18:37:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 101020 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 o4JIZxws009724 for ; Wed, 19 May 2010 18:37:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753601Ab0ESSh3 (ORCPT ); Wed, 19 May 2010 14:37:29 -0400 Received: from mail.gmx.net ([213.165.64.20]:37007 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753535Ab0ESSh2 (ORCPT ); Wed, 19 May 2010 14:37:28 -0400 Received: (qmail invoked by alias); 19 May 2010 18:37:15 -0000 Received: from p57BD1EDF.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.30.223] by mail.gmx.net (mp072) with SMTP; 19 May 2010 20:37:15 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+9j/k+ttG9izhW4/e8DbLwMcj6ItNkFvZGwBiBUr yvvz1jxnirFtx7 Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OEo8z-0002Ki-Uf; Wed, 19 May 2010 20:37:25 +0200 Date: Wed, 19 May 2010 20:37:25 +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 1/2] mmc: let MFD's provide supported Vdd card voltages to tmio_mmc 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:29 +0000 (UTC) diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index a295328..73f6c3d 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -845,7 +845,10 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) mmc->caps |= pdata->capabilities; mmc->f_max = pdata->hclk; mmc->f_min = mmc->f_max / 512; - mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; + if (pdata->ocr_mask) + mmc->ocr_avail = pdata->ocr_mask; + else + mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; /* Tell the MFD core we are ready to be enabled */ if (cell->enable) { diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index feeed0b..f07425b 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -70,6 +70,7 @@ struct tmio_mmc_data { unsigned int hclk; unsigned long capabilities; unsigned long flags; + u32 ocr_mask; /* available voltages */ struct tmio_mmc_dma *dma; void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state);