Message ID | 1537451141-27242-7-git-send-email-linux@roeck-us.net (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-hwmon-owner@kernel.org> 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 DF0266CB for <patchwork-linux-hwmon@patchwork.kernel.org>; Thu, 20 Sep 2018 13:45:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEB342D750 for <patchwork-linux-hwmon@patchwork.kernel.org>; Thu, 20 Sep 2018 13:45:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C26A82D758; Thu, 20 Sep 2018 13:45:55 +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 79A3A2D750 for <patchwork-linux-hwmon@patchwork.kernel.org>; Thu, 20 Sep 2018 13:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731223AbeITT32 (ORCPT <rfc822;patchwork-linux-hwmon@patchwork.kernel.org>); Thu, 20 Sep 2018 15:29:28 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45966 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbeITT32 (ORCPT <rfc822;linux-hwmon@vger.kernel.org>); Thu, 20 Sep 2018 15:29:28 -0400 Received: by mail-pg1-f193.google.com with SMTP id w9-v6so1268444pgc.12 for <linux-hwmon@vger.kernel.org>; Thu, 20 Sep 2018 06:45:54 -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:in-reply-to:references; bh=6iS+go2Y5C4wrfNb93pgvF6YyJT4YAPS+PR/zvmUxdo=; b=Ptj2mWdZ4xG7yACUs7B8FGZVrb4yIlaYA+0eMo3I9g/1fsXxWUtGUY8Vm45f+CABOl UMZE7K2GK1qXOA1gnnD/zivES22csme0jweAJvd8Wn7/SP79fajNAqY2CFVSB3wsIkKY sglH2QCZMF8IB6i6V9AFL+UaTDg8+iCbxybcA6OWuUFXkEKIyeFBKbisFyjvWxVhP8bA ZKTbeXM2xIk8epggwDbKWKP0GAXnCwsGErvfYKwqzCT+Xs/poNI0T72HEV3V2CfLfKjb +IsECx26DGnEBKAdRZ7uimgg5MFlVNKNxqCRx7oAnsn1SyWEFhRg6OdAyR0ezsmPfv3G W2xw== 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 :in-reply-to:references; bh=6iS+go2Y5C4wrfNb93pgvF6YyJT4YAPS+PR/zvmUxdo=; b=m9tVT1WMyZRWu2W/nvbTGAAO5MnEEsRE1XREhIIpSq6TDjoDC11YRfudGSvGi8XTDL MTiOUa7TRbMAZ2kX4z9K5UsF01SJG92nCLNo6W1I9wKWDDB160KVO13Bz53kWAUOZf7+ ALxsonXucuv0MPVwzJAdNJk4UpDndco6Dmla6MrfyGggOukFfSrRGKXIakMQiv+82ri1 yMZ1ngZCrj4G8D/2eFVO6H9hMXphqxGhfeyDvUGUcWmGBGn7TqFZqVd7iIjecxc7sVk1 AqvIZNtuyH/kPiLxy1HyT0eHx6VDVyLV8Na0OLgoH3rnd+7HI+Ci9ZDGw8gkXAVSwKoY R7Hg== X-Gm-Message-State: APzg51CJVND7Cb11GlLTyeax1uxzdlbITfE9o9MkAZ0NoSRLnYgV2DOM y019HbjG37g0YOuoEBVYZQ2oUkQq X-Google-Smtp-Source: ANB0VdZx8fr3eHUPkKO3ymGo0Tg/oivyPSQcDQ3nT/+IW4LzaHTk5fQZEE/uNBeFv5aAlarEUKr1NQ== X-Received: by 2002:a63:c00b:: with SMTP id h11-v6mr36759790pgg.279.1537451154383; Thu, 20 Sep 2018 06:45:54 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id 5-v6sm31367896pgc.86.2018.09.20.06.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 06:45:53 -0700 (PDT) From: Guenter Roeck <linux@roeck-us.net> To: Hardware Monitoring <linux-hwmon@vger.kernel.org> Cc: Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net> Subject: [PATCH 07/13] hwmon: (nct6775) Fix fan6/pwm6 detection for NCT6792D Date: Thu, 20 Sep 2018 06:45:35 -0700 Message-Id: <1537451141-27242-7-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537451141-27242-1-git-send-email-linux@roeck-us.net> References: <1537451141-27242-1-git-send-email-linux@roeck-us.net> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: <linux-hwmon.vger.kernel.org> X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[01/13] hwmon: (nct6775) Rename configuration register variables
|
expand
|
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 0ad4bf0ab8be..6e11df697e6e 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3522,10 +3522,13 @@ nct6775_check_fan_inputs(struct nct6775_data *data) switch (data->kind) { case nct6791: - case nct6792: fan6pin = cr2d & BIT(1); pwm6pin = cr2d & BIT(0); break; + case nct6792: + fan6pin = !dsw_en && (cr2d & BIT(1)); + pwm6pin = !dsw_en && (cr2d & BIT(0)); + break; case nct6793: case nct6795: case nct6796:
Per datasheet, AUXFANIN3 (fan6) and AUXFANOUT3 (pwm6) are only connected if DSW_EN is false. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/nct6775.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)