From patchwork Sat Nov 9 17:51:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 3164021 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 92F9EC045C for ; Sat, 9 Nov 2013 17:51:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA0342017B for ; Sat, 9 Nov 2013 17:51:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7F09200D5 for ; Sat, 9 Nov 2013 17:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756656Ab3KIRvm (ORCPT ); Sat, 9 Nov 2013 12:51:42 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:38658 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755960Ab3KIRvQ (ORCPT ); Sat, 9 Nov 2013 12:51:16 -0500 Received: by mail-pa0-f46.google.com with SMTP id kl14so2285089pab.19 for ; Sat, 09 Nov 2013 09:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DhJvM4UJ3TAAbbuRXvKrICNVWDBqgZ+MEkxIis+fauE=; b=VN+6LiJH1b0R9W3PMvv9Lqa2JAdwnh22jt+ZYVoFtsPFYswRVQvI0BEa+ouKl9mI2x h8dOhSWucIFJmNrhMGRDKT/RNwX4puObuvepAa4TMjKdeXWOCNSJSRapPnUBDHI0EmQv Y6IDfuWIjfDbBvNKsTkdFuzWPzfzY7TGswojDxtnLQvEQOatkPhrXIWVDRttS1RM94ax iJ9mQlTx61pMN/SI8mHxfdrMGecBpR1Nqt8mxlxGzL0nFTxucZVRT2zXTfT91wqtmEEx jH85cI57NqP2XVzXDD7n4cPYgjaB33TBNomopr+UMtRxTeqsTa1EYS4T1Cw6WtiU8itX rZCA== X-Received: by 10.68.189.101 with SMTP id gh5mr21115353pbc.39.1384019476112; Sat, 09 Nov 2013 09:51:16 -0800 (PST) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id cw2sm2261687pbb.25.2013.11.09.09.51.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Nov 2013 09:51:15 -0800 (PST) From: Guenter Roeck To: Jean Delvare , Fenghua Yu Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Guenter Roeck Subject: [PATCH 2/3] hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs Date: Sat, 9 Nov 2013 09:51:08 -0800 Message-Id: <1384019469-18666-2-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1384019469-18666-1-git-send-email-linux@roeck-us.net> References: <1384019469-18666-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since we now have to use PCI IDs to detect CPU types anyway, use this mechanism to detect CE41x0 CPUs. Advantage is that it only requires a single entry and covers all variants of CE41x0, including those unknown to us. Signed-off-by: Guenter Roeck --- drivers/hwmon/coretemp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5c8ab25..cde4e47 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -197,6 +197,7 @@ struct tjmax_pci { }; static const struct tjmax_pci tjmax_pci_table[] __cpuinitconst = { + { 0x0708, 110000 }, /* CE41x0 (Sodaville ) */ { 0x0c72, 102000 }, /* Atom S1240 (Centerton) */ { 0x0c73, 95000 }, /* Atom S1220 (Centerton) */ { 0x0c75, 95000 }, /* Atom S1260 (Centerton) */ @@ -210,9 +211,6 @@ struct tjmax { static const struct tjmax tjmax_table[] = { { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */ { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */ - { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */ - { "CPU CE4150", 110000 }, /* Model 0x1c, stepping 10 */ - { "CPU CE4170", 110000 }, /* Model 0x1c, stepping 10 */ }; struct tjmax_model {