From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A397A14A0A7 for ; Wed, 27 Mar 2024 16:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711558247; cv=none; b=AUR8/ZfNpVQ83y2p0mB6juwBNI+P7bQCkBRf6grwyp5/2WEPpfty74zyo1r4RGKZmYxPuDca+Q6Pq2cEU2jz2PmC9iCoTRXHa1UtAGKJy2txfo9clmd3QCNcFV2Nxt6rfSFIRDBv9Fc05VynIiPn2N7fld8rEtbIaNxJqDhgYtU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711558247; c=relaxed/simple; bh=/7yohUneVkkdei0jfxDZhZMj0ftl071uZiWKwt3NQsM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=qxWlG+okFDpgGZWmfoUxZdTEyZNkkVSKXO8y+8LoUu7CsDOayqDd8bAyAuSXn0/osdemQrSuXzjp35j55v7iRwUZQm1ZghPmrXecOA5IfDUZWCAegUofz2jO4JiWUk3ZzP66CLXa0MSAkBLsqvTt/Wy9tFwGpqWKJVxm9t0Cmck= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DPh07F05; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DPh07F05" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10A32C433F1; Wed, 27 Mar 2024 16:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711558247; bh=/7yohUneVkkdei0jfxDZhZMj0ftl071uZiWKwt3NQsM=; h=Subject:To:Cc:From:Date:From; b=DPh07F05eJWrMI5xCKKXZgeabtxY77XwNbm4bf/6P6bbxEUzkbzu7SJueGpMFDcHM AhHTbvLClt6GSZnppwKTFMHBQbyYgSkGIv8EX0XXhAwu9eObaATX91fjmaaVqVvo34 WQPLKXmbeDu6hUWb91qN52GAlp6qYSE+SLPLjWxc= Subject: FAILED: patch "[PATCH] iio: pressure: Fixes BMP38x and BMP390 SPI support" failed to apply to 6.6-stable tree To: vassilisamir@gmail.com,Jonathan.Cameron@huawei.com,Stable@vger.kernel.org,andriy.shevchenko@linux.intel.com,ang.iglesiasg@gmail.com Cc: From: Date: Wed, 27 Mar 2024 17:50:31 +0100 Message-ID: <2024032731-refocus-droop-1342@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x a9dd9ba323114f366eb07f1d9630822f8df6cbb2 # git commit -s git send-email --to '' --in-reply-to '2024032731-refocus-droop-1342@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: a9dd9ba32311 ("iio: pressure: Fixes BMP38x and BMP390 SPI support") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a9dd9ba323114f366eb07f1d9630822f8df6cbb2 Mon Sep 17 00:00:00 2001 From: Vasileios Amoiridis Date: Mon, 19 Feb 2024 20:13:59 +0100 Subject: [PATCH] iio: pressure: Fixes BMP38x and BMP390 SPI support According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor. Reviewed-by: Andy Shevchenko Fixes: 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family") Signed-off-by: Vasileios Amoiridis Acked-by: Angel Iglesias Link: https://lore.kernel.org/r/20240219191359.18367-1-vassilisamir@gmail.com Cc: Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp280-spi.c index e8a5fed07e88..a444d4b2978b 100644 --- a/drivers/iio/pressure/bmp280-spi.c +++ b/drivers/iio/pressure/bmp280-spi.c @@ -4,6 +4,7 @@ * * Inspired by the older BMP085 driver drivers/misc/bmp085-spi.c */ +#include #include #include #include @@ -35,6 +36,34 @@ static int bmp280_regmap_spi_read(void *context, const void *reg, return spi_write_then_read(spi, reg, reg_size, val, val_size); } +static int bmp380_regmap_spi_read(void *context, const void *reg, + size_t reg_size, void *val, size_t val_size) +{ + struct spi_device *spi = to_spi_device(context); + u8 rx_buf[4]; + ssize_t status; + + /* + * Maximum number of consecutive bytes read for a temperature or + * pressure measurement is 3. + */ + if (val_size > 3) + return -EINVAL; + + /* + * According to the BMP3xx datasheets, for a basic SPI read opertion, + * the first byte needs to be dropped and the rest are the requested + * data. + */ + status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1); + if (status) + return status; + + memcpy(val, rx_buf + 1, val_size); + + return 0; +} + static struct regmap_bus bmp280_regmap_bus = { .write = bmp280_regmap_spi_write, .read = bmp280_regmap_spi_read, @@ -42,10 +71,19 @@ static struct regmap_bus bmp280_regmap_bus = { .val_format_endian_default = REGMAP_ENDIAN_BIG, }; +static struct regmap_bus bmp380_regmap_bus = { + .write = bmp280_regmap_spi_write, + .read = bmp380_regmap_spi_read, + .read_flag_mask = BIT(7), + .reg_format_endian_default = REGMAP_ENDIAN_BIG, + .val_format_endian_default = REGMAP_ENDIAN_BIG, +}; + static int bmp280_spi_probe(struct spi_device *spi) { const struct spi_device_id *id = spi_get_device_id(spi); const struct bmp280_chip_info *chip_info; + struct regmap_bus *bmp_regmap_bus; struct regmap *regmap; int ret; @@ -58,8 +96,18 @@ static int bmp280_spi_probe(struct spi_device *spi) chip_info = spi_get_device_match_data(spi); + switch (chip_info->chip_id[0]) { + case BMP380_CHIP_ID: + case BMP390_CHIP_ID: + bmp_regmap_bus = &bmp380_regmap_bus; + break; + default: + bmp_regmap_bus = &bmp280_regmap_bus; + break; + } + regmap = devm_regmap_init(&spi->dev, - &bmp280_regmap_bus, + bmp_regmap_bus, &spi->dev, chip_info->regmap_config); if (IS_ERR(regmap)) {