From patchwork Thu Aug 9 19:59:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10561879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 413D013BB for ; Thu, 9 Aug 2018 20:00:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2ACC52B6A8 for ; Thu, 9 Aug 2018 20:00:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F19E2B6AB; Thu, 9 Aug 2018 20:00:04 +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=-6.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_SBL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5D5A2B6A8 for ; Thu, 9 Aug 2018 20:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727009AbeHIW0Z (ORCPT ); Thu, 9 Aug 2018 18:26:25 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38864 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726931AbeHIW0Y (ORCPT ); Thu, 9 Aug 2018 18:26:24 -0400 Received: by mail-pg1-f193.google.com with SMTP id k3-v6so3240086pgq.5 for ; Thu, 09 Aug 2018 13:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=/Eiv6f+Kn5n2/JAgUACcTs6R2wsIU8FhL1BwcIgZbYw=; b=kqUACr+EpqRagnlIPNGTJMW6ZxAPawJpsU9cBvZXEHB8NH9TTrO2BYEzYB10iZn0Rm ZHOmijOkSn5nrlY7J5GuwOG43y0WJPf+43YewvoflSZeoyX54JFXPjDiY/pjXGpCKEId EcD/NShXlRn73MQiYc2p8/IF/HunYhWsqc3D9G6Z550HGMGu+S6XCCfGzak34tW9sG9q R2eXp0Z8WXNDocUfT2B07r2CEWJFoZi1/At7dZCd1Xu/W8tERSm35630uy4j6zbNp6jk 8QGY3YWU9UFreP4T0SHT+h0u4XO+JDYGJuexEb9C9xNb2MLZaS7lqL9NCbOM5G8qPgyH LWzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=/Eiv6f+Kn5n2/JAgUACcTs6R2wsIU8FhL1BwcIgZbYw=; b=hmO3ILbclD3fE7PNcwLwxUrZGlleFnUkJueCM3r77OoPxKroSQzE8bKJWI20rp6Ir8 nVJ6UPjPouJhkAryig/gi+QRXEDp0hDM5crnqRJo+qBx3zwvBzeT5ewW1pnxZuROZzZu DPrIIJ5h7DXHHRFBZya+ZRGqwNv65NVauWWPQaiwyPHNJdYkgRGbBomq4OLIPS8UJlJh +IY0FAmRG+io7bm3glcImG000dSDRSHm0YRumdW388XMdmfKO6x2Dhk+a47l4xC/NE2H zHYWs+gxQeM3vtLfcJ+7uk3cJoMz2q3xTInofX/HRKgZHdKPNSI8eZG+cChUhmORZOEk tRPQ== X-Gm-Message-State: AOUpUlFMy5PXCCSbHfZ67mVtJE+d67Muy2etzJZRt7R/Wyp+mRiMO4pw /lSgD8MBcqDLn1D0OW1yJyHAtnOF X-Google-Smtp-Source: AA+uWPz4+WhSJ0fSYcP7jFaJrmqlBX8lIe6Z6e/iwknMgMvBgNROnpuxiZgCZI5ocsJNwNqcw9Vrvg== X-Received: by 2002:a65:5286:: with SMTP id y6-v6mr3472143pgp.65.1533844801661; Thu, 09 Aug 2018 13:00:01 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id x2-v6sm14608217pfi.166.2018.08.09.13.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 13:00:00 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck , Michael Larabel , Clemens Ladisch Subject: [PATCH] hwmon: k10temp: Support Threadripper 2920X, 2970WX; simplify offset table Date: Thu, 9 Aug 2018 12:59:57 -0700 Message-Id: <1533844797-5181-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All announced Threadripper 29xx models have a temperature offset of 27 degrees C. Simplify temperature offset table to match all 29xx Threadripper models with a single entry. Also simplify the table to match all 19xx Threadripper models with a single entry. This effectively drops entries for Threadripper 1910/1920/1950 which never saw the light of day. Cc: Michael Larabel Cc: Clemens Ladisch Signed-off-by: Guenter Roeck --- drivers/hwmon/k10temp.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 577e2ede5a1a..bb15d7816a29 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -99,14 +99,8 @@ static const struct tctl_offset tctl_offset_table[] = { { 0x17, "AMD Ryzen 7 1700X", 20000 }, { 0x17, "AMD Ryzen 7 1800X", 20000 }, { 0x17, "AMD Ryzen 7 2700X", 10000 }, - { 0x17, "AMD Ryzen Threadripper 1950X", 27000 }, - { 0x17, "AMD Ryzen Threadripper 1920X", 27000 }, - { 0x17, "AMD Ryzen Threadripper 1900X", 27000 }, - { 0x17, "AMD Ryzen Threadripper 1950", 10000 }, - { 0x17, "AMD Ryzen Threadripper 1920", 10000 }, - { 0x17, "AMD Ryzen Threadripper 1910", 10000 }, - { 0x17, "AMD Ryzen Threadripper 2950X", 27000 }, - { 0x17, "AMD Ryzen Threadripper 2990WX", 27000 }, + { 0x17, "AMD Ryzen Threadripper 19", 27000 }, /* 19{00,20,50}X */ + { 0x17, "AMD Ryzen Threadripper 29", 27000 }, /* 29{20,50,70,90}[W]X */ }; static void read_htcreg_pci(struct pci_dev *pdev, u32 *regval)