From patchwork Sun Dec 23 04:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Fertic X-Patchwork-Id: 10741555 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 399B413A4 for ; Sun, 23 Dec 2018 04:58:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCFF22018E for ; Sun, 23 Dec 2018 04:58:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD12920602; Sun, 23 Dec 2018 04:58:42 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9751728A73 for ; Sun, 23 Dec 2018 04:58:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725793AbeLWE6Y (ORCPT ); Sat, 22 Dec 2018 23:58:24 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:39436 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725267AbeLWE6X (ORCPT ); Sat, 22 Dec 2018 23:58:23 -0500 Received: by mail-it1-f196.google.com with SMTP id a6so11936428itl.4; Sat, 22 Dec 2018 20:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BJl9JvtqFLFxHkxk96iUyl94VYQgxphAIRNyaBqFMK8=; b=F+eGxTGyi9pFc+XPnyWe37XRKfKBjZ8DZcz/oQXbL+mvtW4LyywBn2nCjiU6wq+7cC 2Xz51Y1aW2H73+ey3lvrFX4CfEtuT4SJKmnWptxU0Xi0vtFVB0KFY/n9pqkqCpEAk4RY lgC1iRYlIL+zjZShfMTvWR3br2h3coeO5orJ7zECSlLkySAkIlLgwvu7ANJWo0U9NLsO veFTUwglelhIy+z1B2L0StgWJ2ePYcSG5VGyHuqBQyGRrEkgh4nYzcbmVd4ArOtRD7PK 1qw47i+l6Pj/80NzdbUc43Zu2BuPXDd4YlW+vZWGCQb6fW7bmBDmuYantkFxSoSg7eoL 5IaQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BJl9JvtqFLFxHkxk96iUyl94VYQgxphAIRNyaBqFMK8=; b=ZvqdxqEQW8N9TMXUi0IhcfH/sbxV24nVVITbrGKGXwo6pcJ0bw0Yb0yMa6rCKksku5 e6b4HCvMR+2jyr0pXHEkpEY315ZQqfVNNAqgIcMbbvuUDN3V9wSyxTYw71wIP/XCqxvZ GZKt4ye5BhCEZyoDZiTXz23cTfjqD+pTtMAwaM1Y4XkDncfh5ZY7L9vTn8btggCqk14h 6vIbxfF5wcjh2grlpRJGTl8Vde0zOQG6FDyu+1DAaVzdsUyxVwcss+ss2iuBE4CQ+Yfe dbkDLEkth7+hSmzDySpkuArPQxaymm99mIxSh7HHRRrrSEQMJj9+CKa8yZywxq/nNIPF Vn7A== X-Gm-Message-State: AA+aEWYgGKEedhhQ0/m318Fqxg6MijqtCMuHjEStfW5astgcjysLUYKe 2kOK+Ov34FJxTVQ87pb3idU= X-Google-Smtp-Source: AFSGD/WhRN+X/4F1xgy3h+4+bGM8wDiZrVZpw06JUYMTAzTRB2kjeJHl2e6sTuhKhi23A+bmSj2Fnw== X-Received: by 2002:a02:8244:: with SMTP id q4mr5615297jag.43.1545541102709; Sat, 22 Dec 2018 20:58:22 -0800 (PST) Received: from r2700x.localdomain (c-75-70-96-103.hsd1.co.comcast.net. [75.70.96.103]) by smtp.gmail.com with ESMTPSA id 15sm8435378itv.11.2018.12.22.20.58.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 20:58:22 -0800 (PST) From: Jeremy Fertic To: Jonathan Cameron Cc: Lars-Peter Clausen , Michael Hennerich , Hartmut Knaack , Peter Meerwald-Stadler , Greg Kroah-Hartman , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Jeremy Fertic Subject: [PATCH v2 1/4] staging: iio: adt7316: fix dac_bits assignment Date: Sat, 22 Dec 2018 21:57:40 -0700 Message-Id: <20181223045743.10716-2-jeremyfertic@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181223045743.10716-1-jeremyfertic@gmail.com> References: <20181223045743.10716-1-jeremyfertic@gmail.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The value of dac_bits is used in adt7316_show_DAC() and adt7316_store_DAC(), and it should be either 8, 10, or 12 bits depending on the device in use. The driver currently only assigns a value to dac_bits in adt7316_store_da_high_resolution(). The purpose of the dac high resolution option is not to change dac resolution for normal operation. Instead, it is specific to an optional feature where one or two of the four dacs can be set to output voltage proportional to temperature. If the user chooses to set dac a and/or dac b to output voltage proportional to temperature, the da_high_resolution attribute can optionally be enabled to use 10 bit resolution rather than the default 8 bits. This is only available on the 10 and 12 bit dac devices. If the user attempts to read or write dacs a or b under these settings, the driver's current behaviour is to return an error. Dacs c and d continue to operate normally under these conditions. With the above in mind, remove the dac_bits assignments from this function since the value of dac_bits as used in the driver is not dependent on this dac high resolution option. Since the dac_bits assignments discussed above are currently the only ones in this driver, the default value of dac_bits is 0. This results in incorrect calculations when the dacs are read or written in adt7316_show_DAC() and adt7316_store_DAC(). To correct this, assign a value to dac_bits in adt7316_probe() to ensure correct operation as soon as the device is registered and available to userspace. Fixes: 35f6b6b86ede ("staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver") Signed-off-by: Jeremy Fertic --- drivers/staging/iio/addac/adt7316.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c index 9db49aa186bb..e17c1cb12c94 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -652,17 +652,10 @@ static ssize_t adt7316_store_da_high_resolution(struct device *dev, u8 config3; int ret; - chip->dac_bits = 8; - - if (buf[0] == '1') { + if (buf[0] == '1') config3 = chip->config3 | ADT7316_DA_HIGH_RESOLUTION; - if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516) - chip->dac_bits = 12; - else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517) - chip->dac_bits = 10; - } else { + else config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION); - } ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); if (ret) @@ -2145,6 +2138,13 @@ int adt7316_probe(struct device *dev, struct adt7316_bus *bus, else return -ENODEV; + if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516) + chip->dac_bits = 12; + else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517) + chip->dac_bits = 10; + else + chip->dac_bits = 8; + chip->ldac_pin = devm_gpiod_get_optional(dev, "adi,ldac", GPIOD_OUT_LOW); if (IS_ERR(chip->ldac_pin)) { ret = PTR_ERR(chip->ldac_pin);