From patchwork Thu Sep 20 13:45:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10607791 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 B4015174F for ; Thu, 20 Sep 2018 13:45:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4CAA2D74D for ; Thu, 20 Sep 2018 13:45:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9935D2D758; Thu, 20 Sep 2018 13:45:58 +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 466B32D74D for ; Thu, 20 Sep 2018 13:45:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731305AbeITT3b (ORCPT ); Thu, 20 Sep 2018 15:29:31 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:41154 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbeITT3b (ORCPT ); Thu, 20 Sep 2018 15:29:31 -0400 Received: by mail-pl1-f196.google.com with SMTP id b12-v6so4380315plr.8 for ; Thu, 20 Sep 2018 06:45:57 -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=FzHoMUq7yfce1Pvwjy3Tw993wl3QUEadnx2UDnCrnYo=; b=fa76n6dDtYdS06sApY0NJeClz/hTyb7sbN6jE0C3XVgvJDHRrxBWs+3xDuEVEkaSPx lNaLT2xJrFoOGo8MnQ3jThNNBtYdrLgWuOZY0m8zsTKC65CxOkE0EyrQWzw8gJieoh8D o0b122Er3D5uEctVUWHSpgpv8C+SzuEpu8f4z+3PQUzRH9VU4RbE3v9agXfGb0rpvZ2E 6DegGXohtfhRczK22eFD7wDhvqeF2qsxKp/lTs9KUhWOl0qH1JPkiXsBGnbqIVcKFlvU xAz6SZB21tBAGbi9U3EK258HXoGiXYdWfVv5Aurs2+Y5v2w7cNRfWdYJ2UoSetM1NWNJ +3SQ== 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=FzHoMUq7yfce1Pvwjy3Tw993wl3QUEadnx2UDnCrnYo=; b=Q/IB3bI06g0GXegLl9e3U0RnvDJVP09xoIFKDuY6D538AgSWrUcer4h70U+m98Q5nF oL2+SoMCyBcLrYAmt3MnqnRm8DI9ZfTUXBNgTBdNKo76HalRz+UwOfAzvC2Xrfu5vc/E T0nk4/+wACq9c/yQd7FOKK6crOvrAFJUUubzM+5LctPTL6uu+7JTPueo7SOHMKmg4azc ltVDCE1yUaGx7kVSZOAaJPcYfF9qYmKf0MB/U0p4xJ51tqEOJEqzqegOju1lt4BxAxeK Jn7Eo9VZOyuQC+RpRVSCBZAmHB6HtUtfODgrj1tKbOBPJ/QE2b3ay448AKvNjyslRWQ7 hu+g== X-Gm-Message-State: APzg51AlJBAGHLMBja3KFaEQTirhYoEF2vlkVhNBJ9QfgBNYzr4lP48P MPXXJxJQT3DPb4Qc5wwQkMmmAdJt X-Google-Smtp-Source: ANB0VdZwZUGv2BEvpRumJaWE49HiPbb9psLfDjhYKTLCw8erfuOSb/7H/neKKFNlgX8hmouavwr7PA== X-Received: by 2002:a17:902:848d:: with SMTP id c13-v6mr33483872plo.194.1537451157169; Thu, 20 Sep 2018 06:45:57 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id y7-v6sm28920437pge.8.2018.09.20.06.45.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 06:45:56 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 09/13] hwmon: (nct6775) Separate fan/pwm configuration detection for NCT6795D Date: Thu, 20 Sep 2018 06:45:37 -0700 Message-Id: <1537451141-27242-9-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: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Separate fan/pwm configuration detection for NCT6795D into separate case statement to make the code easier to read. No functional change. Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 556b4cfacbd1..d9c2b934321d 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3542,6 +3542,19 @@ nct6775_check_fan_inputs(struct nct6775_data *data) pwm6pin |= creb & BIT(2); break; case nct6795: + fan5pin |= cr1b & BIT(5); + fan5pin |= creb & BIT(5); + + fan6pin = (cr2a & BIT(4)) && + (!dsw_en || (cred & BIT(4))); + fan6pin |= creb & BIT(3); + + pwm5pin |= cr2d & BIT(7); + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0)); + + pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2)); + pwm6pin |= creb & BIT(2); + break; case nct6796: pwm5pin |= cr2d & BIT(7); fan5pin |= cr1b & BIT(5); @@ -3561,10 +3574,8 @@ nct6775_check_fan_inputs(struct nct6775_data *data) (!dsw_en || (cred & BIT(4))); pwm6pin |= (cr2a & BIT(3)) && (cred & BIT(2)); - if (data->kind == nct6796) { - fan7pin = !(cr2b & BIT(2)); - pwm7pin = !(cr1d & (BIT(2) | BIT(3))); - } + fan7pin = !(cr2b & BIT(2)); + pwm7pin = !(cr1d & (BIT(2) | BIT(3))); break; default: /* NCT6779D */