From patchwork Wed Mar 4 12:03:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 5935781 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3EAFBBF440 for ; Wed, 4 Mar 2015 12:05:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D4DA20272 for ; Wed, 4 Mar 2015 12:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CD0B2026F for ; Wed, 4 Mar 2015 12:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932766AbbCDMEa (ORCPT ); Wed, 4 Mar 2015 07:04:30 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:15933 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932583AbbCDME1 (ORCPT ); Wed, 4 Mar 2015 07:04:27 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NKO00J9IS7DTV40@mailout4.samsung.com>; Wed, 04 Mar 2015 21:04:25 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-15-54f6f4c9d002 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 42.CF.09430.9C4F6F45; Wed, 04 Mar 2015 21:04:25 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NKO00ILPS6ADG60@mmp1.samsung.com>; Wed, 04 Mar 2015 21:04:25 +0900 (KST) From: Lukasz Majewski To: Eduardo Valentin , Kamil Debski , Jean Delvare , Guenter Roeck , Kukjin Kim Cc: lm-sensors@lm-sensors.org, Linux PM list , "linux-samsung-soc@vger.kernel.org" , devicetree@vger.kernel.org, Lukasz Majewski , Kukjin Kim , linux-kernel@vger.kernel.org, Sjoerd Simons , Abhilash Kesavan , Abhilash Kesavan , Lukasz Majewski Subject: [PATCH RESEND v6 5/6] hwmon: pwm-fan: Read PWM FAN configuration from device tree Date: Wed, 04 Mar 2015 13:03:43 +0100 Message-id: <1425470624-25793-6-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1425470624-25793-1-git-send-email-l.majewski@samsung.com> References: <1418897591-18332-1-git-send-email-l.majewski@samsung.com> <1425470624-25793-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t9jAd2TX76FGFyfq23xeM1iJov5R86x Wsy/co3VYundT2wWP15fYLNY81fJonfBVTaL/sevmS3ePOK2ePNwM6PF5V1z2Cw+9x5htJhx fh+TxZOFZ5gs7kzby2Yx/fhbVgcBj7/Pr7N47Jx1l91j06pONo8HE3ezeayb9pbZY+f3BnaP vi2rGD02n672+LxJLoAzissmJTUnsyy1SN8ugSvjxszdjAVt0hU3ns1mbWCcJdbFyMkhIWAi MfXfMUYIW0ziwr31bF2MXBxCAosYJY5eOsMI4XQxSVyc84oJpIpNQE/i892nTCAJEYHtjBIr 5n0Da2EWuMYssW/zUbAqYYEYiUWbOoDaOThYBFQlrt/LAQnzCrhJzNnzkB1inaJE97MJbCA2 p4C7xPVHLSwQ25oZJRad/MI+gZF3ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYzgsH4m vYNxVYPFIUYBDkYlHt4Dsd9ChFgTy4orcw8xSnAwK4nwxl4ECvGmJFZWpRblxxeV5qQWH2KU 5mBREudVsm8LERJITyxJzU5NLUgtgskycXBKNTBGSj3ud5t0q/my+u2bjMfWr0oP/+E0zeLe vyNmm2ZeXGKWlK6xaNcr3dWzJjF9dsoItuDNirs54/DNUGGxCXe0+XdylfttfGz3+5H8zsNX OCVUzjZcPdD6R3mpdfrFW3NLr7UtTVnKuW6r6qL57daF26dZ9Tu+FZwWGZWwf0vEgrPBd9YH vkwsVWIpzkg01GIuKk4EAGvqlVdnAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch provides code for reading PWM FAN configuration data via device tree. The pwm-fan can work with full speed when configuration is not provided. However, errors are propagated when wrong DT bindings are found. Additionally the struct pwm_fan_ctx has been extended. Signed-off-by: Lukasz Majewski --- Changes for v2: - Rename pwm_fan_max_states to pwm_fan_cooling_levels - Moving pwm_fan_of_get_cooling_data() call after setting end enabling PWM FAN - pwm_fan_of_get_cooling_data() now can fail - preserving old behaviour - Remove unnecessary dev_err() call Changes for v3: - Patch's headline has been reedited - pwm_fan_of_get_cooling_data() return code is now being checked. - of_property_count_elems_of_size() is now used instead of_find_property() - More verbose patch description added Changes for v4: - dev_err() has been removed from pwm_fan_of_get_cooling_data() - Returning -EINVAL when "cooling-levels" are defined in DT, but doesn't have the value Changes for v5: - Use of of_find_property() to assess if "cooling-levels" was defined in device tree - Replace of_property_count_elems_of_size() with of_property_count_u32_elems() - Remove ambiguity with returning error code from of_property_count_u32_elems() - Return -EINVAL when "cooling-levels" has zero elements Changes for v6: - None --- drivers/hwmon/pwm-fan.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index bd42d39..e6ed353 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -30,7 +30,10 @@ struct pwm_fan_ctx { struct mutex lock; struct pwm_device *pwm; - unsigned char pwm_value; + unsigned int pwm_value; + unsigned int pwm_fan_state; + unsigned int pwm_fan_max_state; + unsigned int *pwm_fan_cooling_levels; }; static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) @@ -100,6 +103,46 @@ static struct attribute *pwm_fan_attrs[] = { ATTRIBUTE_GROUPS(pwm_fan); +int pwm_fan_of_get_cooling_data(struct device *dev, struct pwm_fan_ctx *ctx) +{ + struct device_node *np = dev->of_node; + int num, i, ret; + + if (!of_find_property(np, "cooling-levels", NULL)) + return 0; + + ret = of_property_count_u32_elems(np, "cooling-levels"); + if (ret <= 0) { + dev_err(dev, "Wrong data!\n"); + return ret ? : -EINVAL; + } + + num = ret; + ctx->pwm_fan_cooling_levels = devm_kzalloc(dev, num * sizeof(u32), + GFP_KERNEL); + if (!ctx->pwm_fan_cooling_levels) + return -ENOMEM; + + ret = of_property_read_u32_array(np, "cooling-levels", + ctx->pwm_fan_cooling_levels, num); + if (ret) { + dev_err(dev, "Property 'cooling-levels' cannot be read!\n"); + return ret; + } + + for (i = 0; i < num; i++) { + if (ctx->pwm_fan_cooling_levels[i] > MAX_PWM) { + dev_err(dev, "PWM fan state[%d]:%d > %d\n", i, + ctx->pwm_fan_cooling_levels[i], MAX_PWM); + return -EINVAL; + } + } + + ctx->pwm_fan_max_state = num - 1; + + return 0; +} + static int pwm_fan_probe(struct platform_device *pdev) { struct device *hwmon; @@ -145,6 +188,11 @@ static int pwm_fan_probe(struct platform_device *pdev) pwm_disable(ctx->pwm); return PTR_ERR(hwmon); } + + ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx); + if (ret) + return ret; + return 0; }