From patchwork Wed Jul 18 06:43:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 142244 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp177943ljj; Tue, 17 Jul 2018 23:44:19 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeEJJb5JqaQPzCf1zPSWCaoWKCcBya0WBWTA3WjR6/2ZqB9dR6P5UbNHldLD2jQFxfX0/Ym X-Received: by 2002:a63:e001:: with SMTP id e1-v6mr4533076pgh.380.1531896259127; Tue, 17 Jul 2018 23:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531896259; cv=none; d=google.com; s=arc-20160816; b=aPboSqUqLZWp80Ydg89RhtCunrpyzWAX+FWIqGf3ve9nNqHju0pHoygvMx5g80CobO wBK5+7WxOROumM7mqBFpyso0AWD+wralCa1H2epBCb2PH2iBSDJK8TOY7Ei637bQi2KT j9GJuou1jM0kREnhZoEBELozwqvQbqvQ86+ydIDWlXTM16mby/0dY5pmQYrPMne3pkxI 1UDV7yGryYIHmw8CD8eEyajPZjqu6X0l/fjMR6LBi5rFu1eitkDvWqUQI+7nVQCf/Dpp e6DvIP5+MeJ8WSTsyeLLR+wMCz7nmfukKnQI8lyOqqQIVjP/K508995b4U+omWzTHSUc mLEQ== 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=raVj4mm1Q1ZaAVWpnDqhGG1LI3uXrzTE+7YpEmBVaYA=; b=k0+kMHq+oatmvb1u7ZAFt5tGqqm0pk5vRF+InaTpy1NtIOMoZ+B8lNKNbOKNkNucuU 2Gq8ptJpmXcRUn/0GJRRe/TS/0PiOUOyuLlVJtvz/KpXWeXvzwyQgsQtFs0NYCWIOp9i 0FlXjXB6J2s2scPaIHblTAHhyT59t6YUrUGCioBAD9knnN1VvDDJF3QUYtN/WvWm6L6f OcbzLFHZNuWzrO9l38Ea26qp/a77FLasXrWHIadq6VeZVXKJ/pv1UmSXdmRbvXA84oiS amwQUwPQQecMc3iX3pfdkq7u7+tCIx+faKrXw1FxyKbCSezwWbldEArdUTe657nvT1YI qMVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PoMfg8UJ; 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 s10-v6si2452352pgv.47.2018.07.17.23.44.18; Tue, 17 Jul 2018 23:44:19 -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=PoMfg8UJ; 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 S1726592AbeGRHUg (ORCPT + 10 others); Wed, 18 Jul 2018 03:20:36 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37923 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729332AbeGRHUf (ORCPT ); Wed, 18 Jul 2018 03:20:35 -0400 Received: by mail-wr1-f66.google.com with SMTP id v14-v6so3428029wro.5 for ; Tue, 17 Jul 2018 23:44:16 -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=raVj4mm1Q1ZaAVWpnDqhGG1LI3uXrzTE+7YpEmBVaYA=; b=PoMfg8UJrRkpQpeINHPAZslsXCQ2QTEN6capaRmJhix+eRImwcBCm6aVDH70rjwvVe pa7e+xjWRO03X1z/ZT+NN2pamr07xaWng5vSgcZDRD1ZVEy/r5cIPzR6OQQNfcyMVP2f 1WJRG544RLxFlPuwY563h7MyZM3e/rcUqusu4= 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=raVj4mm1Q1ZaAVWpnDqhGG1LI3uXrzTE+7YpEmBVaYA=; b=NRi6uowyYxsYylP/WfjujXyLj/rqPPOAUP1Uke6VDPfjwibXXvcC9bnpukBFNrUMTY JDKRjvHjx3W8GRv5qhcRsTPhQ7l/d3fjVLA8XCY/K5Af5F+jkb82YjurKbqEDbLJHPSe LajTj8VzZyc9sUpZMzDg8eTIHqdVuP7pXdP8tvCLnpbaR14Gc0NdORvHnV5Y0xQd/+Dk /pG31c4EQeiRCKpQrqM2lD0R56i3Gx/v6zBi+xXBOsn8Qo6Xpm1LEunHHAo2yq3xNCGL KoJrc96UtElC1IVneQeLBIYgqExKLvCz6FJ7n04RAaDla8dUST5YmyqNLFw5bbWpL0sl 4Teg== X-Gm-Message-State: AOUpUlF8D06U3ugxOB/q6l95rsdYKm45s3eHjrRWBE8CaGgR1AO3+yJq Nll7P20NkfB3GL1kweEDCB0YXQ== X-Received: by 2002:adf:b2f4:: with SMTP id g107-v6mr3517316wrd.53.1531896256281; Tue, 17 Jul 2018 23:44:16 -0700 (PDT) Received: from localhost ([103.249.91.115]) by smtp.gmail.com with ESMTPSA id h2-v6sm1191353wmf.28.2018.07.17.23.44.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 23:44:15 -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, dianders@chromium.org, mka@chromium.org, Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH v8 5/7] thermal: tsens: Rename tsens-8996 to tsens-v2 for reuse Date: Wed, 18 Jul 2018 12:13:11 +0530 Message-Id: <7f2da230d5612ebb6f5e5397cc4b9d1054757823.1531895128.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 Reviewed-by: Bjorn Andersson Tested-by: Matthias Kaehlcke Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- drivers/thermal/qcom/Makefile | 2 +- drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} | 25 ++++++++--------------- 2 files changed, 9 insertions(+), 18 deletions(-) rename drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} (66%) -- 2.7.4 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 3e60cec..44d3736 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 0xa0 -#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,12 @@ 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, };