From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35CD6C432C3 for ; Fri, 22 Nov 2019 11:05:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BE6A20872 for ; Fri, 22 Nov 2019 11:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420718; bh=aAogisomJAHBocZEBIP1KMLQHK4sE4B/orKaVsSdVfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JoK6sbSaT2T9EsZbf0ZvRHAmNgThLHj0IveFteRw/cFEw+hkQ7YIBwWDzJLwJPE9q u8NrGlLZsXTKWOz0z1jloTiniqZSaLEXhkuCVTFolMEZOkcxq//FK59W+SbFCrG5Ga LKV/tBjc0M1aPwknKt2LECY+LE1jwMLObgT3tkBI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728196AbfKVLFQ (ORCPT ); Fri, 22 Nov 2019 06:05:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:60842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731237AbfKVLFP (ORCPT ); Fri, 22 Nov 2019 06:05:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F29620840; Fri, 22 Nov 2019 11:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420714; bh=aAogisomJAHBocZEBIP1KMLQHK4sE4B/orKaVsSdVfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cdZDUWX7ZwJaDeLW0QW4o+wIz//tG+Sk9N0/qrmYdO8tNAYRdddEDt9gawRU/1fVz O/1r6haYp8xk9qwlJTxFgLlI95PkVSUGqI6CQbZq4zqJCfCjKSu4gAzx/g4Aj+dD4V AkvgoQaDctjGvRj9r4muIX+Mymed8PgJ7U8g7k50= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Sasha Levin Subject: [PATCH 4.19 200/220] hwmon: (nct6775) Fix names of DIMM temperature sources Date: Fri, 22 Nov 2019 11:29:25 +0100 Message-Id: <20191122100928.306823890@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guenter Roeck [ Upstream commit 3be8c9d103534fadc72b3e174613f37aa19fa423 ] For NCT6795D and NCT6796D, the DIMM temperature sources are named "Agent[01] Dimm [01]" per datasheet. Match names in datasheets to avoid confusion. Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/nct6775.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index eba692cddbdee..559101a1c1367 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -704,10 +704,10 @@ static const char *const nct6795_temp_label[] = { "PCH_CHIP_TEMP", "PCH_CPU_TEMP", "PCH_MCH_TEMP", - "PCH_DIM0_TEMP", - "PCH_DIM1_TEMP", - "PCH_DIM2_TEMP", - "PCH_DIM3_TEMP", + "Agent0 Dimm0", + "Agent0 Dimm1", + "Agent1 Dimm0", + "Agent1 Dimm1", "BYTE_TEMP0", "BYTE_TEMP1", "PECI Agent 0 Calibration", @@ -742,10 +742,10 @@ static const char *const nct6796_temp_label[] = { "PCH_CHIP_TEMP", "PCH_CPU_TEMP", "PCH_MCH_TEMP", - "PCH_DIM0_TEMP", - "PCH_DIM1_TEMP", - "PCH_DIM2_TEMP", - "PCH_DIM3_TEMP", + "Agent0 Dimm0", + "Agent0 Dimm1", + "Agent1 Dimm0", + "Agent1 Dimm1", "BYTE_TEMP0", "BYTE_TEMP1", "PECI Agent 0 Calibration", -- 2.20.1