From patchwork Thu Nov 14 10:24:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3181581 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 04128C045B for ; Thu, 14 Nov 2013 10:25:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66E0A20974 for ; Thu, 14 Nov 2013 10:25:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C390620977 for ; Thu, 14 Nov 2013 10:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752893Ab3KNKZA (ORCPT ); Thu, 14 Nov 2013 05:25:00 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:38692 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752883Ab3KNKZA (ORCPT ); Thu, 14 Nov 2013 05:25:00 -0500 Received: by mail-pd0-f177.google.com with SMTP id v10so1775257pde.8 for ; Thu, 14 Nov 2013 02:24:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=eSNN58HzmQxg1JYhmGxLLB/MCS9qrqJbQFNqmbDAViY=; b=E8GIUGpRNAk1Rf+l+XZ1bvoXz4FbXT81+BbH8Ly+Xue0bKwj1VaodSZZmxMcsLbQmx UIiu8GQaZcGbRCuU/aM0NCl2CpBtGCai2dggiGbAjD0xSqiD3BKkSj1EolOn5+KJ1Rmx tPB4EFeVPxJ7bV4ES21r/NVWkGw/2AcBlqENGIYnGCbXxVlfAoCg+t+CL6I9WyiDOi3k jJodrm1npotnIpIMeuU1zjjH3Bc6RxT1oE064r8jV8PdA9bV4eSXCq/LLfeIJcmdyOlm 1Wc7quDKF9J9QUJDhFUO9ZA19qvM2UvXUeDrBg2qg0ETTigfKR79Q2H5Fy8fm5+1gtmm MkXw== X-Received: by 10.66.146.199 with SMTP id te7mr697469pab.106.1384424699361; Thu, 14 Nov 2013 02:24:59 -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 ye1sm58139517pab.19.2013.11.14.02.24.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 02:24:58 -0800 (PST) Date: Thu, 14 Nov 2013 02:24:58 -0800 (PST) Message-ID: <87d2m3z3ex.wl%kuninori.morimoto.gx@renesas.com> To: Chris Ball Cc: Simon , Laurent , Magnus , Linux-SH , Kuninori Morimoto , linux-mmc@vger.kernel.org In-Reply-To: <87habfz3kd.wl%kuninori.morimoto.gx@renesas.com> References: <87li0rz3to.wl%kuninori.morimoto.gx@renesas.com> <87habfz3kd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/17] 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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Kuninori Morimoto Acked-by: Laurent Pinchart --- 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) *