From patchwork Sat Apr 21 15:12:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10354253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F3EA60231 for ; Sat, 21 Apr 2018 15:19:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A591288E8 for ; Sat, 21 Apr 2018 15:19:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BB5F288F4; Sat, 21 Apr 2018 15:19:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F2920288E8 for ; Sat, 21 Apr 2018 15:19:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uNla9Wy+7zJlyA4/s9vuxHByDSeUyjmDciI1McXbT6c=; b=nIfzqVa2d/squApv1NwnLIzzCe iPHFGr6rjhnEHBnVsudU0F/h9/bhiLOdAtrpkwewgGNf/q+S2XW9VUABahuQaoK0Im+UmzYHd2/Ky K26uDZ2BnI3P0PSbr3QRtglWmuuytI02akH0z3WqrSzh/ZR880PiElmX3Hw+XX6YLJ7TmwgLWUeke 7L8egbIsRPTg+82hqvMvNM42OVkKIMY95EGwc2E/ylN2hJQ2v40H+xv8v1zKWK0IliH0uF2tIqPDH Zz/4LNzhiBklXuTub9TBp2QXDffesiZq2+1cdWobsFzRVE3TYx/zE+JMz2U2RiWp2nRtAkUx2TIk+ DT0oLoYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f9uIP-0007CT-Kq; Sat, 21 Apr 2018 15:19:25 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f9uCi-0003cK-IX for linux-arm-kernel@lists.infradead.org; Sat, 21 Apr 2018 15:13:34 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 352A1208F6; Sat, 21 Apr 2018 17:13:13 +0200 (CEST) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 34986207B7; Sat, 21 Apr 2018 17:13:02 +0200 (CEST) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Zhang Rui , Eduardo Valentin Subject: [PATCH 05/27] thermal: armada: dissociate a380 and cp110 ->init() hooks Date: Sat, 21 Apr 2018 17:12:33 +0200 Message-Id: <20180421151255.29929-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180421151255.29929-1-miquel.raynal@bootlin.com> References: <20180421151255.29929-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180421_081332_781787_BF0B011C X-CRM114-Status: GOOD ( 14.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-pm@vger.kernel.org, Antoine Tenart , Catalin Marinas , Will Deacon , Maxime Chevallier , Nadav Haklai , David Sniatkiwicz , Rob Herring , Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Until now, Armada 380 and CP110 could share the same ->init() function because their use was identical. Prepare the support of multi-sensors support and overheat interrupt feature by separating the initialization paths before they actually diverge. Signed-off-by: Miquel Raynal --- drivers/thermal/armada_thermal.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 3d22a6016b04..9291ea3ad2f7 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -200,6 +200,12 @@ static void armada_ap806_init(struct platform_device *pdev, armada_wait_sensor_validity(priv); } +static void armada_cp110_init(struct platform_device *pdev, + struct armada_thermal_priv *priv) +{ + armada380_init(pdev, priv); +} + static bool armada_is_valid(struct armada_thermal_priv *priv) { u32 reg = readl_relaxed(priv->status); @@ -306,7 +312,7 @@ static const struct armada_thermal_data armada_ap806_data = { static const struct armada_thermal_data armada_cp110_data = { .is_valid = armada_is_valid, - .init = armada380_init, + .init = armada_cp110_init, .is_valid_bit = BIT(10), .temp_shift = 0, .temp_mask = 0x3ff,