From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0018C2D0C0 for ; Mon, 23 Dec 2019 17:01:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 935692073A for ; Mon, 23 Dec 2019 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577120469; bh=AcKGxlT3BAZYAUTGHDurlIYesU4U8NPAe5VfcD1zuiY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=IV46CrilYZFZUoVHvfMhk1bdk+P+HZrbQbmx6CTZtYrIMWRum0vqAu9e8eIzKBtxO 1LNTd5NAmLMLhCmoMNQ2CScL+GYLTyHcYF7nRJWdu1qvZ+SwuV3+Va5QVcbNwbtCLN oRigHopX2rFeCzGdyQnjH+qyYNg5IvGLZ7LJRsz0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726756AbfLWRBJ (ORCPT ); Mon, 23 Dec 2019 12:01:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:45044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbfLWRBJ (ORCPT ); Mon, 23 Dec 2019 12:01:09 -0500 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B34B820709; Mon, 23 Dec 2019 17:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577120468; bh=AcKGxlT3BAZYAUTGHDurlIYesU4U8NPAe5VfcD1zuiY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=cQv4mTBmO521kFJ2Cx+oF1f9EBlpdwuFXXLCxlnHKpHKxc5dFgjf1dc3wjR0LkwmX SF8fDbf4CD+fmvKnlD77rctUbffalwmc08nQ0GS8DDD9JBKgAVcbIQrbk72CCgaCHq d+WSkydAZXi73YtMSJiiVy4vbQh3uX5kVG8BYm/o= Date: Mon, 23 Dec 2019 16:50:06 +0000 From: Jonathan Cameron To: Lorenzo Bianconi Cc: linux-iio@vger.kernel.org, lorenzo.bianconi@redhat.com Subject: Re: [PATCH 1/6] iio: imu: st_lsm6dsx: export max num of slave devices in st_lsm6dsx_shub_settings Message-ID: <20191223165006.3ee0be50@archlinux> In-Reply-To: <9c4945c59f4ac63d28de6180da2409a95c60aee5.1576341963.git.lorenzo@kernel.org> References: <9c4945c59f4ac63d28de6180da2409a95c60aee5.1576341963.git.lorenzo@kernel.org> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Sat, 14 Dec 2019 17:52:54 +0100 Lorenzo Bianconi wrote: > Export max number of slave devices supported by the i2c master > controller in st_lsm6dsx_shub_settings data structure. > This is a preliminary patch to support i2c master controller > on lsm6dsm sensors > > Signed-off-by: Lorenzo Bianconi Applied. Thanks, J > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++ > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 ++ > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 3 +-- > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > index c605b153be41..fb76e0d6770d 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -176,6 +176,7 @@ struct st_lsm6dsx_hw_ts_settings { > * @pullup_en: i2c controller pull-up register info (addr + mask). > * @aux_sens: aux sensor register info (addr + mask). > * @wr_once: write_once register info (addr + mask). > + * @num_ext_dev: max number of slave devices. > * @shub_out: sensor hub first output register info. > * @slv0_addr: slave0 address in secondary page. > * @dw_slv0_addr: slave0 write register address in secondary page. > @@ -187,6 +188,7 @@ struct st_lsm6dsx_shub_settings { > struct st_lsm6dsx_reg pullup_en; > struct st_lsm6dsx_reg aux_sens; > struct st_lsm6dsx_reg wr_once; > + u8 num_ext_dev; > u8 shub_out; > u8 slv0_addr; > u8 dw_slv0_addr; > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index a4ed72aef93e..bf995b58c333 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -882,6 +882,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .addr = 0x14, > .mask = BIT(6), > }, > + .num_ext_dev = 3, > .shub_out = 0x02, > .slv0_addr = 0x15, > .dw_slv0_addr = 0x21, > @@ -1256,6 +1257,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .addr = 0x14, > .mask = BIT(6), > }, > + .num_ext_dev = 3, > .shub_out = 0x02, > .slv0_addr = 0x15, > .dw_slv0_addr = 0x21, > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > index fa5d1001a46c..5684e663d0aa 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > @@ -30,7 +30,6 @@ > > #include "st_lsm6dsx.h" > > -#define ST_LSM6DSX_MAX_SLV_NUM 3 > #define ST_LSM6DSX_SLV_ADDR(n, base) ((base) + (n) * 3) > #define ST_LSM6DSX_SLV_SUB_ADDR(n, base) ((base) + 1 + (n) * 3) > #define ST_LSM6DSX_SLV_CONFIG(n, base) ((base) + 2 + (n) * 3) > @@ -770,7 +769,7 @@ int st_lsm6dsx_shub_probe(struct st_lsm6dsx_hw *hw, const char *name) > if (err < 0) > return err; > > - if (++num_ext_dev >= ST_LSM6DSX_MAX_SLV_NUM) > + if (++num_ext_dev >= hw->settings->shub_settings.num_ext_dev) > break; > id++; > }