From patchwork Wed Feb 17 07:37:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 79836 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 o1H7cJCW002669 for ; Wed, 17 Feb 2010 07:38:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752034Ab0BQHiR (ORCPT ); Wed, 17 Feb 2010 02:38:17 -0500 Received: from mail-yx0-f200.google.com ([209.85.210.200]:44338 "EHLO mail-yx0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934064Ab0BQHiQ (ORCPT ); Wed, 17 Feb 2010 02:38:16 -0500 Received: by mail-yx0-f200.google.com with SMTP id 38so5036438yxe.4 for ; Tue, 16 Feb 2010 23:38:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=5onRGkmhBdJCEJpx8v0fwZtEdyXe+i82nq3C2E+h+6Q=; b=ucbnmMyhltNoFwHxi/3BjuDlBKTX4EA0L+ZDqypDziyVssieDe5L8JSwwmLbWk3LPx OYeE6BXRjONM2B3oL3O4WVkTve2C24zWU+2enTqXV/RsRqrsACWZVz355qRNfI3NG6Iz U9qqMWBSNRDjd5nKxlps8IQ5yvrlcEEGEimj4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=e87KJiTweTHOpfnrqnypgUSJEo6pjIlEcScU9ZetcqD8mwgjCJAwiAt7w5v7TZIuUx mbyd1OBGzt6r6h5Zzv1Fcl81DYdSS6Kgd5py6a+jjMG7KF4WpFt53vb9alZsYVP1xr+J Le5DF/a5mAykvsySu7RK+W3/fbSPZ1gC2S0nE= Received: by 10.100.54.5 with SMTP id c5mr5982713ana.188.1266392295937; Tue, 16 Feb 2010 23:38:15 -0800 (PST) Received: from ?127.0.0.1? (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 16sm685002gxk.1.2010.02.16.23.38.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Feb 2010 23:38:15 -0800 (PST) From: Magnus Damm To: linux-mmc@vger.kernel.org Cc: sameo@linux.intel.com, linux-sh@vger.kernel.org, linus.ml.walleij@gmail.com, g.liakhovetski@gmx.de, goda.yusuke@renesas.com, ian@mnementh.co.uk, lethal@linux-sh.org, akpm@linux-foundation.org, Magnus Damm Date: Wed, 17 Feb 2010 16:37:55 +0900 Message-Id: <20100217073755.32726.32930.sendpatchset@t400s> In-Reply-To: <20100217073735.32726.12020.sendpatchset@t400s> References: <20100217073735.32726.12020.sendpatchset@t400s> Subject: [PATCH 02/05] tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2 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, 17 Feb 2010 07:38:19 +0000 (UTC) diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index e22c3fa..e2c0cc9 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -550,6 +550,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) mmc->ops = &tmio_mmc_ops; mmc->caps = MMC_CAP_4_BIT_DATA; + 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; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 9cb1834..37d9414 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -60,6 +60,7 @@ void tmio_core_mmc_clk_div(void __iomem *cnf, int shift, int state); */ struct tmio_mmc_data { const unsigned int hclk; + unsigned long capabilities; void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); };