From patchwork Sun Jul 17 05:30:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9233565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EA3656086B for ; Sun, 17 Jul 2016 05:33:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA6E425749 for ; Sun, 17 Jul 2016 05:33:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE7BA2686A; Sun, 17 Jul 2016 05:33:09 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 718B225749 for ; Sun, 17 Jul 2016 05:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752402AbcGQFcw (ORCPT ); Sun, 17 Jul 2016 01:32:52 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:43347 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbcGQFbh (ORCPT ); Sun, 17 Jul 2016 01:31:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From; bh=DSy9poCaROb+QBpEKxViBO9jR02/b6Vsuwu2y3eQfc0=; b=Nz185mgUXH6xV5 euH+UD33MK0vGew8iLolUTaFGSifuWQ1zfFWuBq+9ogoJhJ4NzLv4gF2tlX6Uyk2ucIy/rGS6jeoV OG04d3NxAdBbSaMfkvos/D68RWtWBzrDU3UX1yGu7HnJ4u1Vmj05Zcs6bgyJUPITJI1ZSu9YNosJR JCI8adD3bVObQnhp7cGj8ngLuTQRDMHbwkNfuvjx30nN6G2YsWB81RPvNU4n8zj0/Yj/QSAdMw7zn bmIlP2Zs6tSf2bfXKza4ViiUzf0Ct2Y8y3kpF+JR3dnCnCnspqstepaQNKZtPGswDTob5ETV1Brpr End1frxL/Vslq2675Vhg==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:44058 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1bOefE-003PlR-UQ; Sun, 17 Jul 2016 05:30:53 +0000 From: Guenter Roeck To: Jean Delvare Cc: Jonathan Cameron , Zhang Rui , Eduardo Valentin , Punit Agrawal , linux-pm@vger.kernel.org, linux-iio@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH v2 9/9] hwmon: (core) Add basic pwm attribute support to new API Date: Sat, 16 Jul 2016 22:30:32 -0700 Message-Id: <1468733432-15730-10-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1468733432-15730-1-git-send-email-linux@roeck-us.net> References: <1468733432-15730-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add basic pwm attribute support (no auto attributes) to new API. Signed-off-by: Guenter Roeck --- v2: Added patch Documentation/hwmon/hwmon-kernel-api.txt | 2 ++ drivers/hwmon/hwmon.c | 9 +++++++++ include/linux/hwmon.h | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.txt index f60a29ce7592..ef9d74947f5c 100644 --- a/Documentation/hwmon/hwmon-kernel-api.txt +++ b/Documentation/hwmon/hwmon-kernel-api.txt @@ -168,6 +168,7 @@ It contains following fields: * hwmon_energy Energy sensor * hwmon_humidity Humidity sensor * hwmon_fan Fan speed sensor + * hwmon_pwm PWM control * config: Pointer to a 0-terminated list of configuration values for each sensor of the given type. Each value is a combination of bit values @@ -230,6 +231,7 @@ HWMON_P_xxxx Power attributes, for use with hwmon_power. HWMON_E_xxxx Energy attributes, for use with hwmon_energy. HWMON_H_xxxx Humidity attributes, for use with hwmon_humidity. HWMON_F_xxxx Fan speed attributes, for use with hwmon_fan. +HWMON_PWM_xxxx PWM control attributes, for use with hwmon_pwm. Driver callback functions ------------------------- diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 38c217e64d41..bd99732e415b 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -379,6 +379,13 @@ static const char * const hwmon_fan_attr_templates[] = { [hwmon_fan_fault] = "fan%d_fault", }; +static const char * const hwmon_pwm_attr_templates[] = { + [hwmon_pwm_input] = "pwm%d", + [hwmon_pwm_enable] = "pwm%d_enable", + [hwmon_pwm_mode] = "pwm%d_mode", + [hwmon_pwm_freq] = "pwm%d_freq", +}; + static const char * const *__templates[] = { [hwmon_chip] = hwmon_chip_attr_templates, [hwmon_temp] = hwmon_temp_attr_templates, @@ -388,6 +395,7 @@ static const char * const *__templates[] = { [hwmon_energy] = hwmon_energy_attr_templates, [hwmon_humidity] = hwmon_humidity_attr_templates, [hwmon_fan] = hwmon_fan_attr_templates, + [hwmon_pwm] = hwmon_pwm_attr_templates, }; static const int __templates_size[] = { @@ -399,6 +407,7 @@ static const int __templates_size[] = { [hwmon_energy] = ARRAY_SIZE(hwmon_energy_attr_templates), [hwmon_humidity] = ARRAY_SIZE(hwmon_humidity_attr_templates), [hwmon_fan] = ARRAY_SIZE(hwmon_fan_attr_templates), + [hwmon_pwm] = ARRAY_SIZE(hwmon_pwm_attr_templates), }; static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index 74e89d45ff67..9d2f8bde7d12 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h @@ -28,6 +28,7 @@ enum hwmon_sensor_types { hwmon_energy, hwmon_humidity, hwmon_fan, + hwmon_pwm, }; enum hwmon_chip_attributes { @@ -272,6 +273,18 @@ enum hwmon_fan_attributes { #define HWMON_F_MAX_ALARM BIT(hwmon_fan_max_alarm) #define HWMON_F_FAULT BIT(hwmon_fan_fault) +enum hwmon_pwm_attributes { + hwmon_pwm_input, + hwmon_pwm_enable, + hwmon_pwm_mode, + hwmon_pwm_freq, +}; + +#define HWMON_PWM_INPUT BIT(hwmon_pwm_input) +#define HWMON_PWM_ENABLE BIT(hwmon_pwm_enable) +#define HWMON_PWM_MODE BIT(hwmon_pwm_mode) +#define HWMON_PWM_FREQ BIT(hwmon_pwm_freq) + /** * struct hwmon_ops - hwmon device operations * @is_visible: Callback to return attribute visibility. Mandatory.