From patchwork Mon Jul 9 11:43:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 141390 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2563384ljj; Mon, 9 Jul 2018 04:44:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfjMjn3pIWiYnXhnxGFT8bcGVxNInF2PFEQE4yZz2Wzfu1ywZNJva4dzoJDihxUIPNvROIj X-Received: by 2002:a17:902:e85:: with SMTP id 5-v6mr20290985plx.318.1531136664287; Mon, 09 Jul 2018 04:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531136664; cv=none; d=google.com; s=arc-20160816; b=NPCW5gCnVn9voRb1Tx39lZGpFobro1IsGh4fdsqIeq6Jyx+f7V6jsfuhra+ypVM3R9 rsU3bTauf9CgwLbqGizbVy+3g7IvqXyKDL8AVZJjzlerCTMrFZkUtxjofbaBob8wcEHi x48IqTnRfkeMZGQgItdLUWBPwQa/EHN+GTPJZKFxe/8KLFkaWeFlPtT8Z7kiGwwzLSFe olsf7uYIncbXinWRqWIbCeCv6r9/JqshZwKFWUCRegmVTp/AYXOBD+oKoNumLRRvq5p+ 0jaApo3m8df3lyxM750NeMRgZ3np9s95V5eHpASCHnJb9mouYfmnKu1rTMD4HZm5A7Fb UehA== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=2kQdfwaob3qy9LVH8RWOXrQk/39YsJ9FerONY2LPNaY=; b=o7wmWmKwBz5WkpLtd0Qh2oz5pFcdzLyYzUkZFm8LB/tOogb+E/itvXDNRTwq2ZoWxz uToFVl0a6jrocsYbQp0Fa860IEed2/4K7tvAbT4sQkktt6T7IMFSQwea5+3JWZhpHugJ GaczASqacEgEqdK2CwSYKXHA2SyRNplxg8btP3He/I9DfQ2nDPCyqOBVlRKBLKtPwIZq /SOyVCZ9mevANWo+tz989yf35Wna/BMffSQWESOJat+pb9UF1Y/kl2H3l2FXmn8RZ1os ChWnKkHTfzSrRfllCvWjacqBAYQtgXZjigEn1xMfDNOtdwlsCegyut/RnsmHi/VGcyy9 C18A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G+okqS9r; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1-v6si13487248pgb.464.2018.07.09.04.44.24; Mon, 09 Jul 2018 04:44:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=@linaro.org header.s=google header.b=G+okqS9r; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754553AbeGILoU (ORCPT + 10 others); Mon, 9 Jul 2018 07:44:20 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36324 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754548AbeGILoT (ORCPT ); Mon, 9 Jul 2018 07:44:19 -0400 Received: by mail-pg1-f193.google.com with SMTP id m19-v6so1212513pgv.3 for ; Mon, 09 Jul 2018 04:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=2kQdfwaob3qy9LVH8RWOXrQk/39YsJ9FerONY2LPNaY=; b=G+okqS9r7yFtBuOok0flmSmDZYsU+gpxIqRC6jpS2+UD2kOEo2WFuQERDUqUmNgfzP 7clXqAOp2bMzJGXkiJMsVzOPivi/ehmiQrW53oOYbpjOqL5ozRLnIeL08oiAzhROhzqF U/tiE+aOxbOdXLIa3FaPemN33uNc+xZPN44so= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=2kQdfwaob3qy9LVH8RWOXrQk/39YsJ9FerONY2LPNaY=; b=MRqV3iVESDR1TbLsm49gbjTkakofeTlkSbFmrskZ9LFzsKCTTQQLxFzttPYGqxyhcd zffnA3bkXkrZNM/5FsqowFK+te/LZZazLTh6tm+Or/lq1DCGtvGMAJKZfOQoY9zkfsVJ GbPNM+xYrixMcFzWkqftXFmVoLhUEbB61gqAqUydoHde2d4Z45q3EqnMFD4QKcAUalq5 nzpvp4Us7zfU9N2P8iCHjI7Df1ENGU0+4bPCSdOY5I8MS1Ta7XnWNMAvMgmN9EfnrubG KB91cEsCbHZ+v2MX2eG2VUwp90rFzXJGYCMuvM/EQxksJKXCcznQ6N7eRiI4woCSxPAy ik+g== X-Gm-Message-State: APt69E1q2TY8CKOPSuvXkT1y9qLSCmjCN7LY8tSfYtwh406BmIsNuxHi kNdCZFZmCztR+bo9L3GWh7/sdQ== X-Received: by 2002:a63:1a20:: with SMTP id a32-v6mr12388090pga.446.1531136658589; Mon, 09 Jul 2018 04:44:18 -0700 (PDT) Received: from localhost ([103.249.91.93]) by smtp.gmail.com with ESMTPSA id x68-v6sm26013922pfb.138.2018.07.09.04.44.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jul 2018 04:44:18 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, smohanad@codeaurora.org, vivek.gautam@codeaurora.org, andy.gross@linaro.org, Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH v6 4/7] thermal: tsens: Rename tsens-8996 to tsens-v2 for reuse Date: Mon, 9 Jul 2018 17:13:26 +0530 Message-Id: <910ed3e440a5612f4113318c66ae2395f53abaae.1531135999.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The TSENS block inside the 8996 is internally classified as version 2 of the IP. Several other SoC families use this block and can share this code. We rename get_temp() to reflect that it can be used across the v2 family. Signed-off-by: Amit Kucheria --- drivers/thermal/qcom/Makefile | 2 +- drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} | 26 ++++++++--------------- 2 files changed, 10 insertions(+), 18 deletions(-) rename drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} (66%) -- 2.7.4 Reviewed-by: Bjorn Andersson diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile index 2cc2193..a821929 100644 --- a/drivers/thermal/qcom/Makefile +++ b/drivers/thermal/qcom/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o -qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-v2.c similarity index 66% rename from drivers/thermal/qcom/tsens-8996.c rename to drivers/thermal/qcom/tsens-v2.c index 60765b1..34ba6c7 100644 --- a/drivers/thermal/qcom/tsens-8996.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -1,27 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * Copyright (c) 2018, Linaro Limited */ -#include #include #include "tsens.h" -#define STATUS_OFFSET 0x10a0 -#define LAST_TEMP_MASK 0xfff +#define STATUS_OFFSET 0xa0 +#define LAST_TEMP_MASK 0xfff #define STATUS_VALID_BIT BIT(21) #define CODE_SIGN_BIT BIT(11) -static int get_temp_8996(struct tsens_device *tmdev, int id, int *temp) +static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) { struct tsens_sensor *s = &tmdev->sensor[id]; u32 code; @@ -73,12 +64,13 @@ static int get_temp_8996(struct tsens_device *tmdev, int id, int *temp) return 0; } -static const struct tsens_ops ops_8996 = { +static const struct tsens_ops ops_generic_v2 = { .init = init_common, - .get_temp = get_temp_8996, + .get_temp = get_temp_tsens_v2, }; const struct tsens_data data_8996 = { .num_sensors = 13, - .ops = &ops_8996, + .ops = &ops_generic_v2, }; +