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 E6498C2D0D0 for ; Mon, 23 Dec 2019 17:01:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC02C20715 for ; Mon, 23 Dec 2019 17:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577120475; bh=NrtETXLLlBj/8Xs0QVX5KTkFYASzQAiY0teBYYbf7w4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=fjqspa4n5FLC6bWRn0f3hI60CR1RlUkol7TqtfH5Lkeu3VDC5rPisfmBEQTMcHc1B 4HqvutrycTrUUBvCwjwn/8++h4fkKQWgHmrUzjxHQOP34yVyVdwwdCzIBMpi3KgynC LOI8lEmxigl/8aJJDZOTGamw9gC5cP+amAygOmHY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbfLWRBP (ORCPT ); Mon, 23 Dec 2019 12:01:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:45122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbfLWRBP (ORCPT ); Mon, 23 Dec 2019 12:01:15 -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 E8B0C20709; Mon, 23 Dec 2019 17:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577120474; bh=NrtETXLLlBj/8Xs0QVX5KTkFYASzQAiY0teBYYbf7w4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=eYESfyCqF5Bg3zTBKcwmzyqKoyr2W0mqseeRPxnIwgq3w1dv5kfFyWF5J/IEuNRu4 wFTxiX5+p36DQ+i3jEJlAIAmcAbHtByLXZe7EoxCKbIDozY5iAapPuXsr21599RwEz wY9xv0mAfrLqxSUEqldsdEHYRqxc7pcohyUpLc8A= Date: Mon, 23 Dec 2019 16:51:40 +0000 From: Jonathan Cameron To: Lorenzo Bianconi Cc: linux-iio@vger.kernel.org, lorenzo.bianconi@redhat.com Subject: Re: [PATCH 2/6] iio: imu: st_lsm6dsx: check if master_enable is located in primary page Message-ID: <20191223165140.1da5632c@archlinux> In-Reply-To: <9301949c51a78df2c818619c3be634274f13a790.1576341963.git.lorenzo@kernel.org> References: <9301949c51a78df2c818619c3be634274f13a790.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:55 +0100 Lorenzo Bianconi wrote: > Check if the master enable register is located in the primary or in the > secondary memory page. This is a preliminary patch to support i2c master > controller on lsm6dsm devices > > Signed-off-by: Lorenzo Bianconi Applied. Thanks, Jonathan > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 6 +++++- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 ++ > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 11 +++++++---- > 3 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > index fb76e0d6770d..0f8f3fbde67a 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -184,7 +184,11 @@ struct st_lsm6dsx_hw_ts_settings { > */ > struct st_lsm6dsx_shub_settings { > struct st_lsm6dsx_reg page_mux; > - struct st_lsm6dsx_reg master_en; > + struct { > + bool sec_page; > + u8 addr; > + u8 mask; > + } master_en; > struct st_lsm6dsx_reg pullup_en; > struct st_lsm6dsx_reg aux_sens; > struct st_lsm6dsx_reg wr_once; > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index bf995b58c333..fe1aaaf68a9b 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -867,6 +867,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .mask = BIT(6), > }, > .master_en = { > + .sec_page = true, > .addr = 0x14, > .mask = BIT(2), > }, > @@ -1242,6 +1243,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { > .mask = BIT(6), > }, > .master_en = { > + .sec_page = true, > .addr = 0x14, > .mask = BIT(2), > }, > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > index 5684e663d0aa..767482e61a1e 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c > @@ -185,15 +185,18 @@ static int st_lsm6dsx_shub_master_enable(struct st_lsm6dsx_sensor *sensor, > mutex_lock(&hw->page_lock); > > hub_settings = &hw->settings->shub_settings; > - err = st_lsm6dsx_set_page(hw, true); > - if (err < 0) > - goto out; > + if (hub_settings->master_en.sec_page) { > + err = st_lsm6dsx_set_page(hw, true); > + if (err < 0) > + goto out; > + } > > data = ST_LSM6DSX_SHIFT_VAL(enable, hub_settings->master_en.mask); > err = regmap_update_bits(hw->regmap, hub_settings->master_en.addr, > hub_settings->master_en.mask, data); > > - st_lsm6dsx_set_page(hw, false); > + if (hub_settings->master_en.sec_page) > + st_lsm6dsx_set_page(hw, false); > out: > mutex_unlock(&hw->page_lock); >