From patchwork Fri Nov 24 16:24:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119612 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2446811qgn; Fri, 24 Nov 2017 08:30:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMZn8vHJ3JcFZWr+IJCOGcQhVmpFMSYdmEabrrVBGV7glIk0klGF3JEiaWcXgOKSqL6NPt/8 X-Received: by 10.99.95.143 with SMTP id t137mr29288389pgb.442.1511541021993; Fri, 24 Nov 2017 08:30:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511541021; cv=none; d=google.com; s=arc-20160816; b=tlizCn0m+oIWo/AD30NEi13mRkow9S47fFPcukiiLuXV7Rm7L7wEpXpcI/Vb6mo7xu rFf6s00in+GxfLbV3n+TzbN0pVJDYwwyWKhmhHw0s/CxjN9Nw1NIwfVK2skVbX9RfRoH +RPZ498LI9bzit3Ek3yshhcQerjyr7yw+t3AohjNg5C1uHH1JInIUt18N1myi8+WsDev zYkAc+BMuIYXqdBIWxMR8XI7x+FLrFAn7Ca+EPIBkKgns9s8npjOWUpZBCd9cRPd3qoy uJRBP3mSwvawngzvClWp1qQmnpHoUOfX90Yb2726HXXt/iDVG4NNr3t7ZIcE6+1WsxzK i0eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=FlEXhhcQ6J2gJ5nRcOt9qRfxuBFF8AR8yuAxbA9Vn4E=; b=ozQdFyK+ziKEKi0BrohchZNWRDUv9Z0reH3B63VpBq3Nk9iNxvgKn6ZBP6Ez50r8zG 6DngWpS/+/oahjpWRDz0zimN9ufo6o4vuR5Ha+tvue8wgcspvlVE1SGZ4uvBubU5T2Pb JDZXpm0ESusSYlgU7ReMkPWcsRqWUvtUGxNUzYGAND46Un7Y+ErY2YJboXtNA/EQ+QNd OgbCKYL/unnpwRZJmiJgUawTuSoQUB2de6aIe5lUvclh2s6NjqX7axMSTWHICqoztGWf ul4QynLVlqiZMIRMx6lQ2YUxZNBc5PlRvNLOJ+r24rnmEMbUId+MtBshKmhyFaucztcp eZDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=q16YfPZ8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n2si18330057pgv.530.2017.11.24.08.30.21; Fri, 24 Nov 2017 08:30:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=q16YfPZ8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753876AbdKXQaU (ORCPT + 28 others); Fri, 24 Nov 2017 11:30:20 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:61629 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbdKXQ0I (ORCPT ); Fri, 24 Nov 2017 11:26:08 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-11.nifty.com with ESMTP id vAOGP9W0007100; Sat, 25 Nov 2017 01:25:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com vAOGP9W0007100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511540721; bh=FlEXhhcQ6J2gJ5nRcOt9qRfxuBFF8AR8yuAxbA9Vn4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q16YfPZ8F4kkFXfy8uPvx8DpTj/XJY1qIEbmoLVF8FHK8kZ3HrdTaTE4HMJGkz9tR iZ+QzV2kvoT81RISIfQ++xuF7e7NfLoLmqrjVnRKIGalKo6WInZohrumfCjHwgfR+b SGJNW4ff2I3JDXOlMo72PoBIVwyB4W5Pw7wNmCOIiZN8Iyw+4aXgv+6fjIn3Fw2wa/ sU0AQSPLlYIVRB4Josz2vEZX3H3MjNx7vMot9wYH6biqbPdz2SV3V8CTiiNqLwilfl OwyOfH7hIiVONFu8qkaVEmUx5m34LVJ+WJU1AEU6dd+N1XJD3GS7dcUwPAceTT6gFw /tgxU21e5cl0A== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Wolfram Sang Cc: Simon Horman , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 14/22] mmc: tmio, renesas_sdhi: move ssc_tappos to renesas_sdhi.h Date: Sat, 25 Nov 2017 01:24:49 +0900 Message-Id: <1511540697-27387-15-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> References: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org struct tmio_mmc_host has "scc_tappos", but in fact, it is Renesas private data. Move it to renesas_sdhi.h Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added drivers/mmc/host/renesas_sdhi.h | 1 + drivers/mmc/host/renesas_sdhi_core.c | 4 ++-- drivers/mmc/host/tmio_mmc.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 Reviewed-by: Wolfram Sang diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h index 3250dbe..f13f798 100644 --- a/drivers/mmc/host/renesas_sdhi.h +++ b/drivers/mmc/host/renesas_sdhi.h @@ -51,6 +51,7 @@ struct renesas_sdhi { struct pinctrl *pinctrl; struct pinctrl_state *pins_default, *pins_uhs; void __iomem *scc_ctl; + u32 scc_tappos; }; #define host_to_priv(host) \ diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 34fd194..e78dca7 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -267,7 +267,7 @@ static unsigned int renesas_sdhi_init_tuning(struct tmio_mmc_host *host) ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL)); - sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, host->scc_tappos); + sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, priv->scc_tappos); /* Read TAPNUM */ return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >> @@ -590,7 +590,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, for (i = 0; i < of_data->taps_num; i++) { if (taps[i].clk_rate == 0 || taps[i].clk_rate == host->mmc->f_max) { - host->scc_tappos = taps->tap; + priv->scc_tappos = taps->tap; hit = true; break; } diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 8b169a0..9f083dc 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -166,7 +166,6 @@ struct tmio_mmc_host { struct mutex ios_lock; /* protect set_ios() context */ bool native_hotplug; bool sdio_irq_enabled; - u32 scc_tappos; /* Mandatory callback */ int (*clk_enable)(struct tmio_mmc_host *host);