From patchwork Sun Mar 12 03:32:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Povilus X-Patchwork-Id: 737776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vgmmX4vQ8z9s7H for ; Sun, 12 Mar 2017 14:33:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=povil-us.20150623.gappssmtp.com header.i=@povil-us.20150623.gappssmtp.com header.b="SpcXq9L2"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933525AbdCLDdQ (ORCPT ); Sat, 11 Mar 2017 22:33:16 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:33615 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933089AbdCLDdP (ORCPT ); Sat, 11 Mar 2017 22:33:15 -0500 Received: by mail-io0-f193.google.com with SMTP id f84so10532534ioj.0 for ; Sat, 11 Mar 2017 19:33:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=povil-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=M4wx4w/CGDSVj/x7Fw9DHJsKQfCgdNabeNTqUkyRxzA=; b=SpcXq9L2fhp0oEk6sM8ASeNEenl6mKgfymESm6At6a/XAPEfATOgrR3y/KQRjdlPcL jYp0mwnVWEvp6MlBvLl6x8GSwE48HE5S+8I1MwnnYEALp/OleOZngUQHk4SiRDJwkLSB M46kKAtp6p8oDuMVVDzBTVNBzamfY0Gknfb7LBGPcNyq2WyZHBiBmou5y6qARfqYWRlh iA9zFGnWLjbN3LInm4mdlg4Ip9w1zmiWP97leFKuzNiPnkxVEnRctG3RBfigHKAjcCVc 1ZWVTbabKTT5fHNxEThLApRT78hU+HnqDaxUoBisa/E7750uAcw18euSPOREqN7xmHtq nNoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=M4wx4w/CGDSVj/x7Fw9DHJsKQfCgdNabeNTqUkyRxzA=; b=R7JfxhyTUaunoFkx7mgPCYoJTD2/QPEMlrHsJ7tHgcuK3HwlVkSZdU5gJT6WZ6yHoM oDDn/DZRcSvCO2xhf/GltMZ0kJvgkasrttAS6jekqh3J0Efnfj3aT8jJh24vp8RT6yYa mgMSHQT2F2Ij0KeSqRFDCWKhno3H7k5kD812jHlShR1I3A+jMuXHXUW7BR0McUYLWxO0 fPNKqcWroqvYNT2KXKxWBqCFTbvaxteRsEI90htcYU4+v3vqlDgl0MK9tFwaDYg+x6PY 6Ge530yT+tK7h0RagKJ5H3hF6ulnKaKiP/WxuFvFXJdAx0mOMb9bu/ql787hu38+OdQn 9y6A== X-Gm-Message-State: AMke39m6TB/AfSq5YJwuB/k/Bjv1DE+gwEZO/YFEryvHWvqjaocH3ZY2COS4Ckf0dNwvOA== X-Received: by 10.107.57.2 with SMTP id g2mr25103391ioa.117.1489289593778; Sat, 11 Mar 2017 19:33:13 -0800 (PST) Received: from irascible.hsd1.co.comcast.net (c-67-161-204-6.hsd1.co.comcast.net. [67.161.204.6]) by smtp.gmail.com with ESMTPSA id l79sm1919435itb.24.2017.03.11.19.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Mar 2017 19:33:13 -0800 (PST) From: Sam Povilus To: wsa@the-dreams.de, jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-i2c@vger.kernel.org Cc: Sam Povilus Subject: [PATCH v2] Adding the ability for the ads7828 and ads7830 to use the device tree to get thier optional parameters, instead of using platform devices. This allows people using custom boards to also use the ads7828 in a non-default manner. Date: Sat, 11 Mar 2017 20:32:54 -0700 Message-Id: <20170312033254.14799-1-kernel.development@povil.us> X-Mailer: git-send-email 2.11.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Also adding a note to the user if they misconfigure the device's external reference. Signed-off-by: Sam Povilus --- Documentation/devicetree/bindings/hwmon/ads7828.txt | 18 ++++++++++++++++++ .../devicetree/bindings/i2c/trivial-devices.txt | 2 -- drivers/hwmon/ads7828.c | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwmon/ads7828.txt diff --git a/Documentation/devicetree/bindings/hwmon/ads7828.txt b/Documentation/devicetree/bindings/hwmon/ads7828.txt new file mode 100644 index 000000000000..7cd786585b51 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/ads7828.txt @@ -0,0 +1,18 @@ +ads7828 properties + +Required properties: +- compatible: + Should be one of + ti,ads7828 + ti,ads7830 +- reg: I2C address + +Optional properties: + +- diff_input + Set to use the device in differential mode. +- ext_vref + Set to enable the external voltage reference on the device. +- vref_mv + The external reference on the device is set to this as an unsigned integer in + milivolts. Must use "ext_vref" for this to have any meaning. diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index cdd7b48826c3..87648909f6ce 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -163,8 +163,6 @@ st,m41t00 Serial real-time clock (RTC) st,m41t62 Serial real-time clock (RTC) with alarm st,m41t80 M41T80 - SERIAL ACCESS RTC WITH ALARMS taos,tsl2550 Ambient Light Sensor with SMBUS/Two Wire Serial Interface -ti,ads7828 8-Channels, 12-bit ADC -ti,ads7830 8-Channels, 8-bit ADC ti,tsc2003 I2C Touch-Screen Controller ti,tmp102 Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface ti,tmp103 Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c index ee396ff167d9..05fc0ac06c06 100644 --- a/drivers/hwmon/ads7828.c +++ b/drivers/hwmon/ads7828.c @@ -118,6 +118,7 @@ static int ads7828_probe(struct i2c_client *client, struct ads7828_data *data; struct device *hwmon_dev; unsigned int vref_mv = ADS7828_INT_VREF_MV; + unsigned int vref_mv_tmp; bool diff_input = false; bool ext_vref = false; unsigned int regval; @@ -131,11 +132,25 @@ static int ads7828_probe(struct i2c_client *client, ext_vref = pdata->ext_vref; if (ext_vref && pdata->vref_mv) vref_mv = pdata->vref_mv; + } else if (dev->of_node) { + if (of_get_property(dev->of_node, "diff_input", NULL)) + diff_input = true; + if (of_get_property(dev->of_node, "ext_vref", NULL)) + ext_vref = true; + if (!of_property_read_u32(dev->of_node, "vref_mv", &vref_mv_tmp) + && ext_vref) + vref_mv = vref_mv_tmp; } /* Bound Vref with min/max values */ + vref_mv_tmp = vref_mv; vref_mv = clamp_val(vref_mv, ADS7828_EXT_VREF_MV_MIN, ADS7828_EXT_VREF_MV_MAX); + if (vref_mv_tmp != vref_mv) { + pr_info("You used and invalid external vref," + " it has been clamped to %u", + vref_mv); + } /* ADS7828 uses 12-bit samples, while ADS7830 is 8-bit */ if (id->driver_data == ads7828) {