From patchwork Wed Nov 20 08:16:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3212081 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AEC3FC045B for ; Wed, 20 Nov 2013 08:16:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7896F20693 for ; Wed, 20 Nov 2013 08:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B4B72068D for ; Wed, 20 Nov 2013 08:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751330Ab3KTIQQ (ORCPT ); Wed, 20 Nov 2013 03:16:16 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:62739 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182Ab3KTIQQ (ORCPT ); Wed, 20 Nov 2013 03:16:16 -0500 Received: by mail-pb0-f45.google.com with SMTP id rp16so3170336pbb.32 for ; Wed, 20 Nov 2013 00:16:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:from:subject:mime-version:content-type; bh=BF5/oNw52IrZVBhfn5t3ki4edoeFRNcuCIkQWFkyXxY=; b=n3Kugn+rTzyXTXxW1OdrTFNaQoPRfseNHmhIRH6+5VnoKgpxV3ZtDoRLCf8leVAbXP Elk9I3W3EZhisfnHj7MMA4Sx48vTOrgb6rh7TJywYdaaJvhD76QgY2nZicsOxn/tLsFP SJ+gteSVuYdP8/nu/ZqyOTiCLiQsNen5v/WHt5qTJA0chVfQz5Dyo2sNitXv48bSdzIt q0vdxDyLmXocaNVG2MEn9dzR4JKSICVnxAQDW9wFNMKIH/QcpqhRP+YE2lt/iQBb8V89 JfkIrzXYd3TjPQgwdzq/+iGys2etg98/z6m+nEPMreghTQbbXQmS0tu9YMKGoCWZHgYo 5FeQ== X-Received: by 10.66.157.165 with SMTP id wn5mr253150pab.169.1384935375393; Wed, 20 Nov 2013 00:16:15 -0800 (PST) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id oj6sm40751492pab.9.2013.11.20.00.16.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 Nov 2013 00:16:14 -0800 (PST) Date: Wed, 20 Nov 2013 00:16:14 -0800 (PST) Message-ID: <87mwkz8p4k.wl%kuninori.morimoto.gx@renesas.com> To: Simon , Chris Ball Cc: Kuninori Morimoto , linux-mmc@vger.kernel.org From: Kuninori Morimoto Subject: [PATCH] mmc: tmio: don't overwrite caps2 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 02cb3221d5bb351ad9f7469453dcca7594a0fabf (mmc: tmio: support caps2 flags) added caps2 support on tmio, but it overwrites mmc_of_parse() settings. This patch fixes it up Acked-by: Laurent Signed-off-by: Kuninori Morimoto --- >> Chris This was part of "SDHI support for r8a7790" patch-set, but was separated drivers/mmc/host/tmio_mmc_pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 99f6d29..1f5f2ba 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1021,7 +1021,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, mmc->ops = &tmio_mmc_ops; mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; - mmc->caps2 = pdata->capabilities2; + mmc->caps2 |= pdata->capabilities2; mmc->max_segs = 32; mmc->max_blk_size = 512; mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *