From patchwork Wed Mar 21 10:29:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 10299089 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 D59B560385 for ; Wed, 21 Mar 2018 10:30:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1D5E29880 for ; Wed, 21 Mar 2018 10:30:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C05BE2988B; Wed, 21 Mar 2018 10:30:49 +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 1489129895 for ; Wed, 21 Mar 2018 10:30:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751744AbeCUKaV (ORCPT ); Wed, 21 Mar 2018 06:30:21 -0400 Received: from onstation.org ([52.200.56.107]:47330 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691AbeCUK31 (ORCPT ); Wed, 21 Mar 2018 06:29:27 -0400 Received: from xilitla.hsd1.wv.comcast.net (c-98-236-77-125.hsd1.wv.comcast.net [98.236.77.125]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id 014D51AFE; Wed, 21 Mar 2018 10:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=onstation.org; s=default; t=1521628166; bh=aIITRPU8fC8revHYzFJVJaSuxHJzNTJZ/U8EaHxsqt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1r41NKwSSbodRm9lYCvuz3oKsaGDPLqMn0LUHiR6d9iio6VczCH8TNNKKtfcyKgd szG5CVXNf5PpZjOqsvSPF0rRHOB35aDhrqXLBpoHRQk5vaWWgqMVL1YpkpWzMY2vh9 XhhgUr5BQzQN3S/c3elkH8HNCgy7taJDh39EYhsk= From: Brian Masney To: jic23@kernel.org, linux-iio@vger.kernel.org Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-kernel@vger.kernel.org, Jon.Brenner@ams.com Subject: [PATCH 07/11] staging: iio: tsl2x7x: split out als and prox persistence settings Date: Wed, 21 Mar 2018 06:29:08 -0400 Message-Id: <20180321102912.5130-8-masneyb@onstation.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180321102912.5130-1-masneyb@onstation.org> References: <20180321102912.5130-1-masneyb@onstation.org> 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 struct tsl2x7x_settings contained a persistence member that contained both the ALS and proximity persistence fields. This patch splits this out into two separate fields so that the bitmasks in several parts of the code are no longer necessary. The default persistence settings are also changed by this patch from: - Proximity: 0 (Every proximity cycle generates an interrupt) - ALS: 255 (60 consecutive values out of range) to something a little more reasonable based on my testing: - Proximity: 1 (1 proximity value out of range) - ALS: 1 (1 value outside of threshold range) Signed-off-by: Brian Masney --- drivers/staging/iio/light/tsl2x7x.c | 24 +++++++++++------------- drivers/staging/iio/light/tsl2x7x.h | 9 ++++++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 07ce3076a05d..c1e441857226 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -226,10 +226,11 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = { .prox_config = 0, .als_gain_trim = 1000, .als_cal_target = 150, + .als_persistence = 1, .als_interrupt_en = false, .als_thresh_low = 200, .als_thresh_high = 256, - .persistence = 255, + .prox_persistence = 1, .prox_interrupt_en = false, .prox_thres_low = 0, .prox_thres_high = 512, @@ -621,7 +622,9 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev) (chip->settings.als_thresh_high) & 0xFF; chip->tsl2x7x_config[TSL2X7X_ALS_MAXTHRESHHI] = (chip->settings.als_thresh_high >> 8) & 0xFF; - chip->tsl2x7x_config[TSL2X7X_PERSISTENCE] = chip->settings.persistence; + chip->tsl2x7x_config[TSL2X7X_PERSISTENCE] = + (chip->settings.prox_persistence & 0xFF) << 4 | + (chip->settings.als_persistence & 0xFF); chip->tsl2x7x_config[TSL2X7X_PRX_COUNT] = chip->settings.prox_pulse_count; @@ -1043,15 +1046,10 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev, filter_delay = DIV_ROUND_UP((val * 1000) + val2, z); - if (chan->type == IIO_INTENSITY) { - chip->settings.persistence &= 0xF0; - chip->settings.persistence |= - (filter_delay & 0x0F); - } else { - chip->settings.persistence &= 0x0F; - chip->settings.persistence |= - ((filter_delay << 4) & 0xF0); - } + if (chan->type == IIO_INTENSITY) + chip->settings.als_persistence = filter_delay; + else + chip->settings.prox_persistence = filter_delay; ret = 0; break; default: @@ -1108,10 +1106,10 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev, case IIO_EV_INFO_PERIOD: if (chan->type == IIO_INTENSITY) { time = chip->settings.als_time; - mult = chip->settings.persistence & 0x0F; + mult = chip->settings.als_persistence; } else { time = chip->settings.prx_time; - mult = (chip->settings.persistence & 0xF0) >> 4; + mult = chip->settings.prox_persistence; } /* Determine integration time */ diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h index b2aa642299b3..d382cdbb976e 100644 --- a/drivers/staging/iio/light/tsl2x7x.h +++ b/drivers/staging/iio/light/tsl2x7x.h @@ -50,11 +50,13 @@ struct tsl2x7x_lux { * @prox_config: Prox configuration filters. * @als_cal_target: Known external ALS reading for * calibration. - * @persistence: H/W Filters, Number of 'out of limits' - * ADC readings PRX/ALS. + * @als_persistence: H/W Filters, Number of 'out of limits' + * ALS readings. * @als_interrupt_en: Enable/Disable ALS interrupts * @als_thresh_low: CH0 'low' count to trigger interrupt. * @als_thresh_high: CH0 'high' count to trigger interrupt. + * @prox_persistence: H/W Filters, Number of 'out of limits' + * proximity readings. * @prox_interrupt_en: Enable/Disable proximity interrupts * @prox_thres_low: Low threshold proximity detection. * @prox_thres_high: High threshold proximity detection @@ -70,10 +72,11 @@ struct tsl2x7x_settings { int prox_gain; int prox_config; int als_cal_target; - u8 persistence; + u8 als_persistence; bool als_interrupt_en; int als_thresh_low; int als_thresh_high; + u8 prox_persistence; bool prox_interrupt_en; int prox_thres_low; int prox_thres_high;