From nobody Fri Nov 29 21:44:07 2024 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B264923BB; Sat, 14 Sep 2024 00:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273749; cv=none; b=CJvCFiw8p9xpsMT9Mc26J+WynsmSp2eNXMxkuxkkbYOMCxBk+z92hgrY5RTLT3fA7GtEmvm67aI3qlTxNP87Z018G5ppmLtv6qEeo05coZ/mMAxcTC9XsScK/gGiPgCOh5J/TF/PS3YaJZS9lKI+w+BsxJsc9lFfTJBMCybm7go= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273749; c=relaxed/simple; bh=kDipoU3lQ/uGOi+DsTAtuRK93jWZRg6WFsQvwzoki0c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J1R1nrAKW0O1uK+0qxym6k1Q/T4CIrbP4tjiDTlM23r5r0igGKJeO4PaAI5VwyXcyJVrgijr4z7VZ2vl2xdWfKioeuNjO13nVgvO3fMjkqnpp/lmLKzkH9rCGqlb99g5zT9dB6BQGVCKWfYmztvh2z5TscTdsFfmYE4DcdsqKug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OBRvKfAs; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OBRvKfAs" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-42cb57f8b41so19692685e9.0; Fri, 13 Sep 2024 17:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726273746; x=1726878546; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VMDyMRoNGbenRc4QoitE5nG2Uq5o9HsYkvuTivKoCKk=; b=OBRvKfAsmjpL3yryZ2+83wC1RXazVmcRORDOyMFipBT+G/S9fuOv0guXna2u3eUO7g MrbOcH9lEz8gVH4jjMy6jZXcN99OC8QZbhRHf1td4PGQhvs8bCC6s+WT/fnjTJC7HT8O GZRKkCEWTGz5T4YVg/C0jsLJBhn6ft/yWJPcPZtLYC9uw9MXLfwTJgw0yWz5BF+qxR9f Yk7XdeOtZExkgnoZx62mIyg5WG8Dr/faU3c249t+6GZvX8iziQzmqXf6IeUDWl9acjyg 393AB70c7Ga+Y4caZQ4Ju2Oaeof7SxfcN33yEvrlusydkXOyzfnSeNy4HM4NesClI493 kblA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726273746; x=1726878546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VMDyMRoNGbenRc4QoitE5nG2Uq5o9HsYkvuTivKoCKk=; b=YuLcPC1iDOIxKrojlIym9F6s6phpLb78Yo1+CKa4i10exvaZsfFtRsK/X+7KX3kLTb 5xBsVA/QGBPBm62p5D7+Bg4qnFa+J6KU1uqFjrxz850qimMLHV98lundeRvexnKXNFla 2z2z3SIuYMc4epy1ogqh+DxQ51aNmU0wXx9jNMWCEtS5AwVsRx12NY/LKjqQgYc4ZJaX n4TwUgXNISYvcw604pLKo7hZO9X1cr7Bppj0s1sAqoQ43eoDBiv3OG3hpWXoSnLP4Guo Lg6J93pRtB4aj+iCu0YUQAsxI6CHelxweLwvYS0konY45ehfJrRBWJZnjiOfhAZ7mq55 3cLQ== X-Forwarded-Encrypted: i=1; AJvYcCU6NE6K0Lz0FItMutK04d5e6tyfbrAcKy92fFl/j6ouwVM0Qxo8Pi+GJyNYFqw9VWsnRShHAlxjCKuO@vger.kernel.org, AJvYcCUrvg6uKXOUHnamfN3aC0ypN1UWUcmOCEiOLoZuwop1tA9xUT2LF5GHou4DlyeHK6wp+AzL9ClLycXx@vger.kernel.org, AJvYcCWgU0p8ZKjFtqfmjtwecw7ZAWEaqWnskt9BICfNjEepfWBfFywZp0Vn3r61vWDE6nsInT9yjAhGUMPCHftu@vger.kernel.org X-Gm-Message-State: AOJu0YyzL/HNQzOd/+zt8ZxD9HjeerCCE9npOah2bxS5BS1AfQQJszdH 9SZQT02QSjTQn36hQ7VysA/XFgkQCpeVrdodBQDIRlgE/MIfKRXU X-Google-Smtp-Source: AGHT+IH+qruwMeZ6gQBBzbJd3bNM7FPsnJDzkrN+5HSbVV9r5MfnChIswlXV0UvkWX3MIZYb8AQb4A== X-Received: by 2002:a05:600c:4f41:b0:42c:b950:6821 with SMTP id 5b1f17b1804b1-42d90829e60mr40170965e9.19.1726273745413; Fri, 13 Sep 2024 17:29:05 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:6bd1:9a24:6b02:4a8f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610f43f4sm15157666b.80.2024.09.13.17.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 17:29:05 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org, lars@metafoo.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andriy.shevchenko@linux.intel.com Cc: vassilisamir@gmail.com, ang.iglesiasg@gmail.com, linus.walleij@linaro.org, biju.das.jz@bp.renesas.com, javier.carrasco.cruz@gmail.com, semen.protsenko@linaro.org, 579lpy@gmail.com, ak@it-klinger.de, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr Subject: [PATCH v7 1/4] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Date: Sat, 14 Sep 2024 02:28:57 +0200 Message-Id: <20240914002900.45158-2-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240914002900.45158-1-vassilisamir@gmail.com> References: <20240914002900.45158-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add forced mode support in sensors BMP28x, BME28x, BMP3xx and BMP58x. Sensors BMP18x and BMP085 are old and do not support this feature so their operation is not affected at all. Essentially, up to now, the rest of the sensors were used in normal mode all the time. This means that they are continuously doing measurements even though these measurements are not used. Even though the sensor does provide PM support, to cover all the possible use cases, the sensor needs to go into sleep mode and wake up whenever necessary. The idea is that the sensor is by default in sleep mode, wakes up in forced mode when a oneshot capture is requested, or in normal mode when the buffer is enabled. The difference lays in the fact that in forced mode, the sensor does only one conversion and goes back to sleep while in normal mode, the sensor does continuous measurements with the frequency that was set in the ODR registers. The bmpX_chip_config() functions which are responsible for applying the requested configuration to the sensor, are modified accordingly in order to set the sensor by default in sleep mode. DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by the BMP58x version, are not added. Reviewed-by: Andy Shevchenko Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 296 +++++++++++++++++++++++++++-- drivers/iio/pressure/bmp280.h | 21 ++ 2 files changed, 296 insertions(+), 21 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp2= 80-core.c index 6d7a9bd6e761..64fb2d720bec 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -16,6 +16,11 @@ * https://www.bosch-sensortec.com/media/boschsensortec/downloads/datashee= ts/bst-bmp390-ds002.pdf * https://www.bosch-sensortec.com/media/boschsensortec/downloads/datashee= ts/bst-bmp581-ds004.pdf * + * Sensor API: + * https://github.com/boschsensortec/BME280_SensorAPI + * https://github.com/boschsensortec/BMP3_SensorAPI + * https://github.com/boschsensortec/BMP5_SensorAPI + * * Notice: * The link to the bmp180 datasheet points to an outdated version missing = these changes: * - Changed document referral from ANP015 to BST-MPS-AN004-00 on page 26 @@ -616,6 +621,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_= dev, =20 switch (mask) { case IIO_CHAN_INFO_PROCESSED: + ret =3D data->chip_info->set_mode(data, BMP280_FORCED); + if (ret) + return ret; + + ret =3D data->chip_info->wait_conv(data); + if (ret) + return ret; + switch (chan->type) { case IIO_HUMIDITYRELATIVE: ret =3D data->chip_info->read_humid(data, &chan_value); @@ -645,6 +658,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_= dev, return -EINVAL; } case IIO_CHAN_INFO_RAW: + ret =3D data->chip_info->set_mode(data, BMP280_FORCED); + if (ret) + return ret; + + ret =3D data->chip_info->wait_conv(data); + if (ret) + return ret; + switch (chan->type) { case IIO_HUMIDITYRELATIVE: ret =3D data->chip_info->read_humid(data, &chan_value); @@ -991,6 +1012,69 @@ static int bmp280_preinit(struct bmp280_data *data) return 0; } =20 +static const u8 bmp280_operation_mode[] =3D { + BMP280_MODE_SLEEP, BMP280_MODE_FORCED, BMP280_MODE_NORMAL, +}; + +static int bmp280_set_mode(struct bmp280_data *data, enum bmp280_op_mode m= ode) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + case BMP280_FORCED: + case BMP280_NORMAL: + break; + default: + return -EINVAL; + } + + ret =3D regmap_write_bits(data->regmap, BMP280_REG_CTRL_MEAS, + BMP280_MODE_MASK, bmp280_operation_mode[mode]); + if (ret) { + dev_err(data->dev, "failed to write ctrl_meas register.\n"); + return ret; + } + + data->op_mode =3D mode; + + return 0; +} + +static int bmp280_wait_conv(struct bmp280_data *data) +{ + unsigned int reg, meas_time_us; + int ret; + + /* Check if we are using a BME280 device */ + if (data->oversampling_humid) + meas_time_us +=3D BMP280_PRESS_HUMID_MEAS_OFFSET + + BIT(data->oversampling_humid) * BMP280_MEAS_DUR; + + /* Pressure measurement time */ + meas_time_us +=3D BMP280_PRESS_HUMID_MEAS_OFFSET + + BIT(data->oversampling_press) * BMP280_MEAS_DUR; + + /* Temperature measurement time */ + meas_time_us +=3D BIT(data->oversampling_temp) * BMP280_MEAS_DUR; + + /* Waiting time according to the BM(P/E)2 Sensor API */ + fsleep(meas_time_us); + + ret =3D regmap_read(data->regmap, BMP280_REG_STATUS, ®); + if (ret) { + dev_err(data->dev, "failed to read status register.\n"); + return ret; + } + + if (reg & BMP280_REG_STATUS_MEAS_BIT) { + dev_err(data->dev, "Measurement cycle didn't complete.\n"); + return -EBUSY; + } + + return 0; +} + static int bmp280_chip_config(struct bmp280_data *data) { u8 osrs =3D FIELD_PREP(BMP280_OSRS_TEMP_MASK, data->oversampling_temp + 1= ) | @@ -1001,7 +1085,7 @@ static int bmp280_chip_config(struct bmp280_data *dat= a) BMP280_OSRS_TEMP_MASK | BMP280_OSRS_PRESS_MASK | BMP280_MODE_MASK, - osrs | BMP280_MODE_NORMAL); + osrs | BMP280_MODE_SLEEP); if (ret) { dev_err(data->dev, "failed to write ctrl_meas register\n"); return ret; @@ -1108,6 +1192,8 @@ const struct bmp280_chip_info bmp280_chip_info =3D { .read_temp =3D bmp280_read_temp, .read_press =3D bmp280_read_press, .read_calib =3D bmp280_read_calib, + .set_mode =3D bmp280_set_mode, + .wait_conv =3D bmp280_wait_conv, .preinit =3D bmp280_preinit, =20 .trigger_handler =3D bmp280_trigger_handler, @@ -1229,6 +1315,8 @@ const struct bmp280_chip_info bme280_chip_info =3D { .read_press =3D bmp280_read_press, .read_humid =3D bme280_read_humid, .read_calib =3D bme280_read_calib, + .set_mode =3D bmp280_set_mode, + .wait_conv =3D bmp280_wait_conv, .preinit =3D bmp280_preinit, =20 .trigger_handler =3D bme280_trigger_handler, @@ -1516,6 +1604,71 @@ static int bmp380_preinit(struct bmp280_data *data) return bmp380_cmd(data, BMP380_CMD_SOFT_RESET); } =20 +static const u8 bmp380_operation_mode[] =3D { + BMP380_MODE_SLEEP, BMP380_MODE_FORCED, BMP380_MODE_NORMAL, +}; + +static int bmp380_set_mode(struct bmp280_data *data, enum bmp280_op_mode m= ode) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + case BMP280_FORCED: + case BMP280_NORMAL: + break; + default: + return -EINVAL; + } + + ret =3D regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL, + BMP380_MODE_MASK, + FIELD_PREP(BMP380_MODE_MASK, + bmp380_operation_mode[mode])); + if (ret) { + dev_err(data->dev, "failed to write power control register.\n"); + return ret; + } + + data->op_mode =3D mode; + + return 0; +} + +static int bmp380_wait_conv(struct bmp280_data *data) +{ + unsigned int reg; + int ret, meas_time_us; + + /* Offset measurement time */ + meas_time_us =3D BMP380_MEAS_OFFSET; + + /* Pressure measurement time */ + meas_time_us +=3D BMP380_PRESS_MEAS_OFFSET + + BIT(data->oversampling_press) * BMP380_MEAS_DUR; + + /* Temperature measurement time */ + meas_time_us +=3D BMP380_TEMP_MEAS_OFFSET + + BIT(data->oversampling_temp) * BMP380_MEAS_DUR; + + /* Measurement time defined in Datasheet Section 3.9.2 */ + fsleep(meas_time_us); + + ret =3D regmap_read(data->regmap, BMP380_REG_STATUS, ®); + if (ret) { + dev_err(data->dev, "failed to read status register.\n"); + return ret; + } + + if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) && + (reg & BMP380_STATUS_DRDY_TEMP_MASK))) { + dev_err(data->dev, "Measurement cycle didn't complete.\n"); + return -EBUSY; + } + + return 0; +} + static int bmp380_chip_config(struct bmp280_data *data) { bool change =3D false, aux; @@ -1576,17 +1729,19 @@ static int bmp380_chip_config(struct bmp280_data *d= ata) * Resets sensor measurement loop toggling between sleep and * normal operating modes. */ - ret =3D regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL, - BMP380_MODE_MASK, - FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_SLEEP)); + ret =3D bmp380_set_mode(data, BMP280_SLEEP); if (ret) { dev_err(data->dev, "failed to set sleep mode\n"); return ret; } - usleep_range(2000, 2500); - ret =3D regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL, - BMP380_MODE_MASK, - FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_NORMAL)); + + /* + * According to the BMP3 Sensor API, the sensor needs 5ms + * in order to go to the sleep mode. + */ + fsleep(5 * USEC_PER_MSEC); + + ret =3D bmp380_set_mode(data, BMP280_NORMAL); if (ret) { dev_err(data->dev, "failed to set normal mode\n"); return ret; @@ -1612,7 +1767,16 @@ static int bmp380_chip_config(struct bmp280_data *da= ta) } } =20 - return 0; + /* Dummy read to empty data registers. */ + ret =3D bmp380_read_press(data, &tmp); + if (ret) + return ret; + + ret =3D bmp380_set_mode(data, BMP280_SLEEP); + if (ret) + dev_err(data->dev, "failed to set sleep mode.\n"); + + return ret; } =20 static irqreturn_t bmp380_trigger_handler(int irq, void *p) @@ -1705,6 +1869,8 @@ const struct bmp280_chip_info bmp380_chip_info =3D { .read_temp =3D bmp380_read_temp, .read_press =3D bmp380_read_press, .read_calib =3D bmp380_read_calib, + .set_mode =3D bmp380_set_mode, + .wait_conv =3D bmp380_wait_conv, .preinit =3D bmp380_preinit, =20 .trigger_handler =3D bmp380_trigger_handler, @@ -2092,6 +2258,75 @@ static int bmp580_preinit(struct bmp280_data *data) return PTR_ERR_OR_ZERO(devm_nvmem_register(config.dev, &config)); } =20 +static const u8 bmp580_operation_mode[] =3D { + BMP580_MODE_SLEEP, BMP580_MODE_FORCED, BMP580_MODE_NORMAL, +}; + +static int bmp580_set_mode(struct bmp280_data *data, enum bmp280_op_mode m= ode) +{ + struct device *dev =3D data->dev; + int ret; + + switch (mode) { + case BMP280_SLEEP: + case BMP280_NORMAL: + break; + case BMP280_FORCED: + ret =3D regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG, + BMP580_DSP_IIR_FORCED_FLUSH); + if (ret) { + dev_err(dev, "Could not flush IIR filter constants.\n"); + return ret; + } + break; + default: + return -EINVAL; + } + + ret =3D regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG, + BMP580_MODE_MASK, + FIELD_PREP(BMP580_MODE_MASK, + bmp580_operation_mode[mode])); + if (ret) { + dev_err(dev, "failed to write power control register.\n"); + return ret; + } + + data->op_mode =3D mode; + + return 0; +} + +static int bmp580_wait_conv(struct bmp280_data *data) +{ + /* + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical + * characteristics. + */ + static const int time_conv_press[] =3D { + 0, 1050, 1785, 3045, 5670, 10920, 21420, 42420, + 84420, + }; + static const int time_conv_temp[] =3D { + 0, 1050, 1105, 1575, 2205, 3465, 6090, 11340, + 21840, + }; + int meas_time_us; + + meas_time_us =3D 4 * USEC_PER_MSEC + + time_conv_temp[data->oversampling_temp] + + time_conv_press[data->oversampling_press]; + + /* + * Measurement time mentioned in Chapter 2, Table 4 of the datasheet. + * The extra 4ms is the required mode change to start of measurement + * time. + */ + fsleep(meas_time_us); + + return 0; +} + static int bmp580_chip_config(struct bmp280_data *data) { bool change =3D false, aux; @@ -2162,17 +2397,6 @@ static int bmp580_chip_config(struct bmp280_data *da= ta) return ret; } =20 - /* Restore sensor to normal operation mode */ - ret =3D regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG, - BMP580_MODE_MASK, - FIELD_PREP(BMP580_MODE_MASK, BMP580_MODE_NORMAL)); - if (ret) { - dev_err(data->dev, "failed to set normal mode\n"); - return ret; - } - /* From datasheet's table 4: electrical characteristics */ - usleep_range(3000, 3500); - if (change) { /* * Check if ODR and OSR settings are valid or we are @@ -2268,6 +2492,8 @@ const struct bmp280_chip_info bmp580_chip_info =3D { .chip_config =3D bmp580_chip_config, .read_temp =3D bmp580_read_temp, .read_press =3D bmp580_read_press, + .set_mode =3D bmp580_set_mode, + .wait_conv =3D bmp580_wait_conv, .preinit =3D bmp580_preinit, =20 .trigger_handler =3D bmp580_trigger_handler, @@ -2515,6 +2741,19 @@ static int bmp180_read_press(struct bmp280_data *dat= a, u32 *comp_press) return 0; } =20 +/* Keep compatibility with newer generations of the sensor */ +static int bmp180_set_mode(struct bmp280_data *data, enum bmp280_op_mode m= ode) +{ + return 0; +} + +/* Keep compatibility with newer generations of the sensor */ +static int bmp180_wait_conv(struct bmp280_data *data) +{ + return 0; +} + +/* Keep compatibility with newer generations of the sensor */ static int bmp180_chip_config(struct bmp280_data *data) { return 0; @@ -2585,6 +2824,8 @@ const struct bmp280_chip_info bmp180_chip_info =3D { .read_temp =3D bmp180_read_temp, .read_press =3D bmp180_read_press, .read_calib =3D bmp180_read_calib, + .set_mode =3D bmp180_set_mode, + .wait_conv =3D bmp180_wait_conv, =20 .trigger_handler =3D bmp180_trigger_handler, }; @@ -2637,6 +2878,7 @@ static int bmp280_buffer_preenable(struct iio_dev *in= dio_dev) struct bmp280_data *data =3D iio_priv(indio_dev); =20 pm_runtime_get_sync(data->dev); + data->chip_info->set_mode(data, BMP280_NORMAL); =20 return 0; } @@ -2807,6 +3049,10 @@ int bmp280_common_probe(struct device *dev, return ret; } =20 + ret =3D data->chip_info->set_mode(data, BMP280_SLEEP); + if (ret) + return dev_err_probe(dev, ret, "Failed to set sleep mode\n"); + /* Enable runtime PM */ pm_runtime_get_noresume(dev); pm_runtime_set_active(dev); @@ -2832,6 +3078,9 @@ static int bmp280_runtime_suspend(struct device *dev) struct iio_dev *indio_dev =3D dev_get_drvdata(dev); struct bmp280_data *data =3D iio_priv(indio_dev); =20 + data->chip_info->set_mode(data, BMP280_SLEEP); + + fsleep(data->start_up_time); return regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies); } =20 @@ -2846,7 +3095,12 @@ static int bmp280_runtime_resume(struct device *dev) return ret; =20 usleep_range(data->start_up_time, data->start_up_time + 100); - return data->chip_info->chip_config(data); + + ret =3D data->chip_info->chip_config(data); + if (ret) + return ret; + + return data->chip_info->set_mode(data, data->op_mode); } =20 EXPORT_RUNTIME_DEV_PM_OPS(bmp280_dev_pm_ops, bmp280_runtime_suspend, diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index 73516878d020..c9840b8d58b0 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -170,6 +170,11 @@ #define BMP380_MODE_FORCED 1 #define BMP380_MODE_NORMAL 3 =20 +#define BMP380_MEAS_OFFSET 234 +#define BMP380_MEAS_DUR 2020 +#define BMP380_TEMP_MEAS_OFFSET 163 +#define BMP380_PRESS_MEAS_OFFSET 392 + #define BMP380_MIN_TEMP -4000 #define BMP380_MAX_TEMP 8500 #define BMP380_MIN_PRES 3000000 @@ -206,6 +211,7 @@ #define BMP280_REG_CTRL_MEAS 0xF4 #define BMP280_REG_STATUS 0xF3 #define BMP280_REG_STATUS_IM_UPDATE BIT(0) +#define BMP280_REG_STATUS_MEAS_BIT BIT(3) #define BMP280_REG_RESET 0xE0 #define BMP280_RST_SOFT_CMD 0xB6 =20 @@ -246,6 +252,10 @@ #define BMP280_MODE_FORCED 1 #define BMP280_MODE_NORMAL 3 =20 +#define BMP280_MEAS_OFFSET 1250 +#define BMP280_MEAS_DUR 2300 +#define BMP280_PRESS_HUMID_MEAS_OFFSET 575 + /* BME280 specific registers */ #define BME280_REG_HUMIDITY_LSB 0xFE #define BME280_REG_HUMIDITY_MSB 0xFD @@ -384,6 +394,12 @@ struct bmp380_calib { s8 P11; }; =20 +enum bmp280_op_mode { + BMP280_SLEEP, + BMP280_FORCED, + BMP280_NORMAL, +}; + struct bmp280_data { struct device *dev; struct mutex lock; @@ -424,6 +440,9 @@ struct bmp280_data { s64 ts __aligned(8); } buffer; =20 + /* Value to hold the current operation mode of the device */ + enum bmp280_op_mode op_mode; + /* * DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. @@ -488,6 +507,8 @@ struct bmp280_chip_info { int (*read_humid)(struct bmp280_data *data, u32 *adc_humidity); int (*read_calib)(struct bmp280_data *data); int (*preinit)(struct bmp280_data *data); + int (*set_mode)(struct bmp280_data *data, enum bmp280_op_mode mode); + int (*wait_conv)(struct bmp280_data *data); =20 irqreturn_t (*trigger_handler)(int irq, void *p); }; --=20 2.25.1 From nobody Fri Nov 29 21:44:07 2024 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FA6D17D2; Sat, 14 Sep 2024 00:29:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273750; cv=none; b=LJ5aGrmZRTaj1AlJ3QrkpZTqPF5RoR6Ys/+IOZTTYcQW0mEw/04HRpTYcdx2O6A7ej+KAqtkcrXzvkXBxgdC9g9yjNk+STHvLC02SV9o+vcdEg8b846Szvf+VuHCcdRrowKXTtqDWJ+m0YfxbgGoiNT4ZkG5Yeb2h/NrUBvbr60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273750; c=relaxed/simple; bh=7uC/oD/EC1yLWS+RCZzt3d9PsCUcWXEwxeyQTHW1eqM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b/6XO3LE1hBvjVA6P6VIf9YKwezSN8IqAavszf6r8jUY8u7KjZBpWUY/lhtrzoV9B3FJ+8DNF9Dr6FHKK57EvG0S/IIQCx8rIvBK2Zk2hO3VuqEF+iTe0yUM1lvPrsv1/p11mCXCBf7LbFcDYfPrMojZ7kgGXLSfnCG2MbaeUuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AuYK9NCd; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AuYK9NCd" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a8d4093722bso356795166b.0; Fri, 13 Sep 2024 17:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726273747; x=1726878547; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uievK+pt+AYAjztyMLN5d3R8p/Zue4ihwk/QuKxSgQ8=; b=AuYK9NCdjOlSX4+eyux58zTNN1VHNb8swpd50lduUX6yoyZanILULVAN0eQL2jypHi WA9HEtxBjQOlCoEiWZS1Nwtvv5P6dRHgCNNOczmE4JvfCv0igI9dtsRJdhrza86eJl// 0Le88V6OPQVlceaZ5ZG6TFyWfstmN/9l3A+HS7DSBj5VXIslvwl5QFgbTqt11JYLtLL4 gCfRsjIhbrQxj8P0qR/uNXlsaM3wtBm4fO2wdZB1IgMqU4j92zj7btEKt5UNOHILiX6m 600v47tl4qRwgf1pQX8DMEeCl9l4IKK1cITbPmRmxyGfb7MRogMZ6gPHYTaz1ohOyj/g f4xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726273747; x=1726878547; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uievK+pt+AYAjztyMLN5d3R8p/Zue4ihwk/QuKxSgQ8=; b=lcQRVEyDHTmpaMMOIaVdSi2KcTtVKx0ilkjn2XHW+nMHNLvvOp070QoCwYR/To8NT3 +m6/Dxm6/ZVMKnPKvE7A9jmNW1yV3hja8nWXDlgmOnrVdLbvnXgkaeI7abnWssoQxzBI j1vZYv2yhLRPtqspGck3buvlpXNCL1LBHtKUVqkGiVBQY6zSm+PWGX61Kg70yizpeY0f Km86akIW393gNW8x7Vhdcl6wF/1zkOTpX34xDC7dZnV4KlEGJvwV9d035SG5maJ2+k1X YJSlkiEdQYPUbJgLd7ABIuxIP7W57D2lpy2KmW3Eg0jUZw416DCSJjuDechPgkGdl2gd M/EA== X-Forwarded-Encrypted: i=1; AJvYcCUcQvxHqPk/OYpWSNF4VWCA1LJP4jw2lc+eo6tQAZnyFTIXiu9iJpUTv8g1ulynrSNqxDnUgxEsAbUe@vger.kernel.org, AJvYcCVdFJPCSAZqv1rf1+CCda39P3SLW4z97/NPBfR+zfQs9LY5CFJC9ImZ63xiYfYnM+miZx+Mzpq2XB5F@vger.kernel.org, AJvYcCXho22z+K1j53DCBiBhAKNFTkMz2Wwp2qSiaoBoW63UEX03UdIbNuANHHLm0I2B4e95JJyNQ1Q0mq74JCz5@vger.kernel.org X-Gm-Message-State: AOJu0Yx1E/1RFsR4Fx7YpYK1lWJfEqhq1m4CBVd75e8+fcHrE+nlVrMR 9WEJcj4Y4hNQM2aWh/MsAXRs3jTQpFxAmRZZYnXS+aryvGY8Wk36 X-Google-Smtp-Source: AGHT+IG+VP6e83GOh67WL4tpJZYccwgpddn8rN8trSMGh4AEZueo7Bc20+r97ywFZiOxGclxy8WTPw== X-Received: by 2002:a17:907:e9f:b0:a86:9e84:dddc with SMTP id a640c23a62f3a-a902969088amr816623666b.61.1726273746487; Fri, 13 Sep 2024 17:29:06 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:6bd1:9a24:6b02:4a8f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610f43f4sm15157666b.80.2024.09.13.17.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 17:29:06 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org, lars@metafoo.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andriy.shevchenko@linux.intel.com Cc: vassilisamir@gmail.com, ang.iglesiasg@gmail.com, linus.walleij@linaro.org, biju.das.jz@bp.renesas.com, javier.carrasco.cruz@gmail.com, semen.protsenko@linaro.org, 579lpy@gmail.com, ak@it-klinger.de, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr, Conor Dooley Subject: [PATCH v7 2/4] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Date: Sat, 14 Sep 2024 02:28:58 +0200 Message-Id: <20240914002900.45158-3-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240914002900.45158-1-vassilisamir@gmail.com> References: <20240914002900.45158-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add interrupt options for BMP3xx and BMP5xx devices as well. Acked-by: Conor Dooley Signed-off-by: Vasileios Amoiridis --- .../bindings/iio/pressure/bmp085.yaml | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/D= ocumentation/devicetree/bindings/iio/pressure/bmp085.yaml index 6fda887ee9d4..cb201cecfa1a 100644 --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml @@ -47,15 +47,33 @@ properties: maxItems: 1 =20 interrupts: - description: - interrupt mapping for IRQ (BMP085 only) maxItems: 1 =20 + drive-open-drain: + description: + set if the interrupt pin should be configured as open drain. + If not set, defaults to push-pull configuration. + type: boolean + required: - compatible - vddd-supply - vdda-supply =20 +allOf: + - if: + properties: + compatible: + not: + contains: + enum: + - bosch,bmp085 + - bosch,bmp380 + - bosch,bmp580 + then: + properties: + interrupts: false + additionalProperties: false =20 examples: --=20 2.25.1 From nobody Fri Nov 29 21:44:07 2024 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5BB779F6; Sat, 14 Sep 2024 00:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273752; cv=none; b=DoPi25zByEBX0EwXeaodNZUAyZp452NHmnfu5YAJy7ySuhwCwrSh5J9AVA8w9MaZeHocY6US41qmsVm/qXWupTIoa21Lo8JPkqNg1sHKFLtvA+FVnsZpUCQCwWhe0m8fMKzB9BoQACvA8zAimfqTNFByzWUHs2hnZfv//odPMuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273752; c=relaxed/simple; bh=GbA0gjji055dHjx+7A0z3FD74Sx7Dq30g7Be27Ov1Vw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RVyHPEDDUkBsYnDq7W758nuDmcnGTnPEtYDxrIpLOmqVUd6XljfEpld1VAGRxQrEyqQJ6m+xDxr3q0kzXJinS5XO1vsSAGcjM8D4EUQs10CsrGWkPXhyHKeZ1DryTjJOOozS1SQOEL3d09D94UITEZESyqsOAHqcHblen12uSZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cwC9zj+t; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cwC9zj+t" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5c255e3c327so3089150a12.1; Fri, 13 Sep 2024 17:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726273748; x=1726878548; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MYlso/8R0sVW3aJqtei6eUBHEzKAZZG3JvkFLdErIqQ=; b=cwC9zj+tseMG2Cl9aDx4is4OJyYQHCYyFbgSdLMGd9G8g0CMNu7jS5xiQxlOsay2zW WEHtL/bwP8X5miLRF1U7KijzWDiJwgT0jy6Ml6g0mSHey7SEW/9NYlqeBD9wiyd53uKB SmAkEN/UgYY/qvI0DnFIdRQen+R+7wHi8Xyn42T/hOYpJZvQwrdljoCZLqhrtC8Zb6BT bXm0By5DtMNEkXCfm/r/BRb9oMGTy+M3rU/G4luZorH4w3Iee5XtJgYbiggcRn7rvEJ1 V5Kce0wEBt2TvkMP3l/Ha9ohu9htYMDHgwEYr59hwUauRGn7fnl0n/X+c6D3TP/k2erD cKYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726273748; x=1726878548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MYlso/8R0sVW3aJqtei6eUBHEzKAZZG3JvkFLdErIqQ=; b=r+wKZxEGp2Ytk5QIIBvUfpL3JYGVxiVXX2+W0evNoQnBWYaavKOWlEupiyWH8lpUa6 yQOKu4Pmna1888bouD/MDHUBG2DYd7oLo1/Pgoq0v0noP4evaTUYvdCEoLaXiOGCbPHq V8WoUxBGJpbIrSwflrezBokf21l5TukecbbqeoSH6ztc37Z0Bl5RFgsu+lA3LIz8wc0y Qi62p+nAT80xTu7RoWp18pFqq7N8PSjual+5yfYY9Y9QZWiCMHOh8SVaOQySZR+9sOPO 7/+5LfZTEqrZRHmz1WiR7H7SdqnE/cNCruBdNhp3UUt3K6qT5ouVq1xgrLIUOWZiMLuF M4vg== X-Forwarded-Encrypted: i=1; AJvYcCUTBSl20Eb2MUPdxBakp8JO+jEL/59xDLrLSsx0FLzGb/Dg9KnMp61/AvmxlBb2ehqLM9UmsMZYLEiXIuaq@vger.kernel.org, AJvYcCV6OowPe2JwfOxMkPI4fEW9ESAw0WR8UPjdT1REC9KxdLr0XkD0UrJpYFtQOJEN/+o/hTWwfDSc1WBy@vger.kernel.org, AJvYcCWheepl3yS29bDH/wxhwnPFeZ/7T+SMOgCLka0b+7nRRdb1IjCIpDugxlsoKCRylaQtFsMJierjxUhD@vger.kernel.org X-Gm-Message-State: AOJu0YzSZdXRU/q/OedOmSOAEydZL/2CU9nCzEGe+p6EyquZ1Vy9+xWt gh/E9wqZrvEO1s7yWPgU9R/YUTFh+kydpjkkCfsGoOQ8w0B8tngE X-Google-Smtp-Source: AGHT+IGkgKNWnFxVJdIUWkHFGUHXu6nH9fwnAMdXGyAaop+4/YyIyrHR4F3vQ6awTO2vakO/WXQQBg== X-Received: by 2002:a17:907:1c1a:b0:a86:97c0:9bb3 with SMTP id a640c23a62f3a-a902961741bmr835655166b.51.1726273747750; Fri, 13 Sep 2024 17:29:07 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:6bd1:9a24:6b02:4a8f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610f43f4sm15157666b.80.2024.09.13.17.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 17:29:07 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org, lars@metafoo.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andriy.shevchenko@linux.intel.com Cc: vassilisamir@gmail.com, ang.iglesiasg@gmail.com, linus.walleij@linaro.org, biju.das.jz@bp.renesas.com, javier.carrasco.cruz@gmail.com, semen.protsenko@linaro.org, 579lpy@gmail.com, ak@it-klinger.de, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr Subject: [PATCH v7 3/4] iio: pressure: bmp280: Add data ready trigger support Date: Sat, 14 Sep 2024 02:28:59 +0200 Message-Id: <20240914002900.45158-4-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240914002900.45158-1-vassilisamir@gmail.com> References: <20240914002900.45158-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The BMP3xx and BMP5xx sensors have an interrupt pin which can be used as a trigger for when there are data ready in the sensor for pick up. This use case is used along with NORMAL_MODE in the sensor, which allows the sensor to do consecutive measurements depending on the ODR rate value. The trigger pin can be configured to be open-drain or push-pull and either rising or falling edge. No support is added yet for interrupts for FIFO, WATERMARK and out of range values. Reviewed-by: Andy Shevchenko Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 225 ++++++++++++++++++++++++++++- drivers/iio/pressure/bmp280.h | 21 +++ 2 files changed, 244 insertions(+), 2 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp2= 80-core.c index 64fb2d720bec..58ff77cbee64 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -42,12 +42,14 @@ #include #include #include +#include #include #include #include =20 #include #include +#include #include #include =20 @@ -1278,6 +1280,63 @@ static irqreturn_t bme280_trigger_handler(int irq, v= oid *p) return IRQ_HANDLED; } =20 +static int __bmp280_trigger_probe(struct iio_dev *indio_dev, + const struct iio_trigger_ops *trigger_ops, + int (*int_pin_config)(struct bmp280_data *data), + irq_handler_t irq_thread_handler) +{ + struct bmp280_data *data =3D iio_priv(indio_dev); + struct device *dev =3D data->dev; + u32 irq_type; + int ret, irq; + + irq =3D fwnode_irq_get(dev_fwnode(dev), 0); + if (irq < 0) + return dev_err_probe(dev, irq, "No interrupt found.\n"); + + irq_type =3D irq_get_trigger_type(irq); + switch (irq_type) { + case IRQF_TRIGGER_RISING: + data->trig_active_high =3D true; + break; + case IRQF_TRIGGER_FALLING: + data->trig_active_high =3D false; + break; + default: + return dev_err_probe(dev, -EINVAL, "Invalid interrupt type specified.\n"= ); + } + + data->trig_open_drain =3D + fwnode_property_read_bool(dev_fwnode(dev), "int-open-drain"); + + ret =3D int_pin_config(data); + if (ret) + return ret; + + data->trig =3D devm_iio_trigger_alloc(data->dev, "%s-dev%d", + indio_dev->name, + iio_device_id(indio_dev)); + if (!data->trig) + return -ENOMEM; + + data->trig->ops =3D trigger_ops; + iio_trigger_set_drvdata(data->trig, data); + + ret =3D devm_request_threaded_irq(data->dev, irq, NULL, + irq_thread_handler, IRQF_ONESHOT, + indio_dev->name, indio_dev); + if (ret) + return dev_err_probe(dev, ret, "request IRQ failed.\n"); + + ret =3D devm_iio_trigger_register(data->dev, data->trig); + if (ret) + return dev_err_probe(dev, ret, "iio trigger register failed.\n"); + + indio_dev->trig =3D iio_trigger_get(data->trig); + + return 0; +} + static const u8 bme280_chip_ids[] =3D { BME280_CHIP_ID }; static const int bme280_humid_coeffs[] =3D { 1000, 1024 }; =20 @@ -1779,6 +1838,81 @@ static int bmp380_chip_config(struct bmp280_data *da= ta) return ret; } =20 +static void bmp380_trigger_reenable(struct iio_trigger *trig) +{ + struct bmp280_data *data =3D iio_trigger_get_drvdata(trig); + unsigned int tmp; + int ret; + + ret =3D regmap_read(data->regmap, BMP380_REG_INT_STATUS, &tmp); + if (ret) + dev_err(data->dev, "Failed to reset interrupt.\n"); +} + +static int bmp380_data_rdy_trigger_set_state(struct iio_trigger *trig, + bool state) +{ + struct bmp280_data *data =3D iio_trigger_get_drvdata(trig); + int ret; + + guard(mutex)(&data->lock); + + ret =3D regmap_update_bits(data->regmap, BMP380_REG_INT_CONTROL, + BMP380_INT_CTRL_DRDY_EN, + FIELD_PREP(BMP380_INT_CTRL_DRDY_EN, !!state)); + if (ret) + dev_err(data->dev, + "Could not %s interrupt.\n", str_enable_disable(state)); + return ret; +} + +static const struct iio_trigger_ops bmp380_trigger_ops =3D { + .set_trigger_state =3D &bmp380_data_rdy_trigger_set_state, + .reenable =3D &bmp380_trigger_reenable, +}; + +static int bmp380_int_pin_config(struct bmp280_data *data) +{ + int pin_drive_cfg =3D FIELD_PREP(BMP380_INT_CTRL_OPEN_DRAIN, + data->trig_open_drain); + int pin_level_cfg =3D FIELD_PREP(BMP380_INT_CTRL_LEVEL, + data->trig_active_high); + int ret, int_pin_cfg =3D pin_drive_cfg | pin_level_cfg; + + ret =3D regmap_update_bits(data->regmap, BMP380_REG_INT_CONTROL, + BMP380_INT_CTRL_SETTINGS_MASK, int_pin_cfg); + if (ret) + dev_err(data->dev, "Could not set interrupt settings.\n"); + + return ret; +} + +static irqreturn_t bmp380_irq_thread_handler(int irq, void *p) +{ + struct iio_dev *indio_dev =3D p; + struct bmp280_data *data =3D iio_priv(indio_dev); + unsigned int int_ctrl; + int ret; + + scoped_guard(mutex, &data->lock) { + ret =3D regmap_read(data->regmap, BMP380_REG_INT_STATUS, &int_ctrl); + if (ret) + return IRQ_NONE; + } + + if (FIELD_GET(BMP380_INT_STATUS_DRDY, int_ctrl)) + iio_trigger_poll_nested(data->trig); + + return IRQ_HANDLED; +} + +static int bmp380_trigger_probe(struct iio_dev *indio_dev) +{ + return __bmp280_trigger_probe(indio_dev, &bmp380_trigger_ops, + bmp380_int_pin_config, + bmp380_irq_thread_handler); +} + static irqreturn_t bmp380_trigger_handler(int irq, void *p) { struct iio_poll_func *pf =3D p; @@ -1873,6 +2007,7 @@ const struct bmp280_chip_info bmp380_chip_info =3D { .wait_conv =3D bmp380_wait_conv, .preinit =3D bmp380_preinit, =20 + .trigger_probe =3D bmp380_trigger_probe, .trigger_handler =3D bmp380_trigger_handler, }; EXPORT_SYMBOL_NS(bmp380_chip_info, IIO_BMP280); @@ -2420,6 +2555,88 @@ static int bmp580_chip_config(struct bmp280_data *da= ta) return 0; } =20 +static void bmp580_trigger_reenable(struct iio_trigger *trig) +{ + struct bmp280_data *data =3D iio_trigger_get_drvdata(trig); + unsigned int tmp; + int ret; + + ret =3D regmap_read(data->regmap, BMP580_REG_INT_STATUS, &tmp); + if (ret) + dev_err(data->dev, "Failed to reset interrupt.\n"); +} + +static int bmp580_data_rdy_trigger_set_state(struct iio_trigger *trig, + bool state) +{ + struct bmp280_data *data =3D iio_trigger_get_drvdata(trig); + int ret; + + guard(mutex)(&data->lock); + + ret =3D regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG, + BMP580_INT_CONFIG_INT_EN, + FIELD_PREP(BMP580_INT_CONFIG_INT_EN, !!state)); + if (ret) + dev_err(data->dev, + "Could not %s interrupt.\n", str_enable_disable(state)); + return ret; +} + +static const struct iio_trigger_ops bmp580_trigger_ops =3D { + .set_trigger_state =3D &bmp580_data_rdy_trigger_set_state, + .reenable =3D &bmp580_trigger_reenable, +}; + +static int bmp580_int_pin_config(struct bmp280_data *data) +{ + int pin_drive_cfg =3D FIELD_PREP(BMP580_INT_CONFIG_OPEN_DRAIN, + data->trig_open_drain); + int pin_level_cfg =3D FIELD_PREP(BMP580_INT_CONFIG_LEVEL, + data->trig_active_high); + int ret, int_pin_cfg =3D pin_drive_cfg | pin_level_cfg; + + ret =3D regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG, + BMP580_INT_CONFIG_MASK, int_pin_cfg); + if (ret) { + dev_err(data->dev, "Could not set interrupt settings.\n"); + return ret; + } + + ret =3D regmap_set_bits(data->regmap, BMP580_REG_INT_SOURCE, + BMP580_INT_SOURCE_DRDY); + if (ret) + dev_err(data->dev, "Could not set interrupt source.\n"); + + return ret; +} + +static irqreturn_t bmp580_irq_thread_handler(int irq, void *p) +{ + struct iio_dev *indio_dev =3D p; + struct bmp280_data *data =3D iio_priv(indio_dev); + unsigned int int_ctrl; + int ret; + + scoped_guard(mutex, &data->lock) { + ret =3D regmap_read(data->regmap, BMP580_REG_INT_STATUS, &int_ctrl); + if (ret) + return IRQ_NONE; + } + + if (FIELD_GET(BMP580_INT_STATUS_DRDY_MASK, int_ctrl)) + iio_trigger_poll_nested(data->trig); + + return IRQ_HANDLED; +} + +static int bmp580_trigger_probe(struct iio_dev *indio_dev) +{ + return __bmp280_trigger_probe(indio_dev, &bmp580_trigger_ops, + bmp580_int_pin_config, + bmp580_irq_thread_handler); +} + static irqreturn_t bmp580_trigger_handler(int irq, void *p) { struct iio_poll_func *pf =3D p; @@ -2496,6 +2713,7 @@ const struct bmp280_chip_info bmp580_chip_info =3D { .wait_conv =3D bmp580_wait_conv, .preinit =3D bmp580_preinit, =20 + .trigger_probe =3D bmp580_trigger_probe, .trigger_handler =3D bmp580_trigger_handler, }; EXPORT_SYMBOL_NS(bmp580_chip_info, IIO_BMP280); @@ -3043,8 +3261,11 @@ int bmp280_common_probe(struct device *dev, * however as it happens, the BMP085 shares the chip ID of BMP180 * so we look for an IRQ if we have that. */ - if (irq > 0 && (chip_id =3D=3D BMP180_CHIP_ID)) { - ret =3D bmp085_fetch_eoc_irq(dev, name, irq, data); + if (irq > 0) { + if (chip_id =3D=3D BMP180_CHIP_ID) + ret =3D bmp085_fetch_eoc_irq(dev, name, irq, data); + if (data->chip_info->trigger_probe) + ret =3D data->chip_info->trigger_probe(indio_dev); if (ret) return ret; } diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index c9840b8d58b0..0c32b6430677 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -55,8 +55,17 @@ #define BMP580_CMD_NVM_WRITE_SEQ_1 0xA0 #define BMP580_CMD_SOFT_RESET 0xB6 =20 +#define BMP580_INT_STATUS_DRDY_MASK BIT(0) #define BMP580_INT_STATUS_POR_MASK BIT(4) =20 +#define BMP580_INT_SOURCE_DRDY BIT(0) + +#define BMP580_INT_CONFIG_MASK GENMASK(3, 0) +#define BMP580_INT_CONFIG_LATCH BIT(0) +#define BMP580_INT_CONFIG_LEVEL BIT(1) +#define BMP580_INT_CONFIG_OPEN_DRAIN BIT(2) +#define BMP580_INT_CONFIG_INT_EN BIT(3) + #define BMP580_STATUS_CORE_RDY_MASK BIT(0) #define BMP580_STATUS_NVM_RDY_MASK BIT(1) #define BMP580_STATUS_NVM_ERR_MASK BIT(2) @@ -175,6 +184,14 @@ #define BMP380_TEMP_MEAS_OFFSET 163 #define BMP380_PRESS_MEAS_OFFSET 392 =20 +#define BMP380_INT_STATUS_DRDY BIT(3) + +#define BMP380_INT_CTRL_SETTINGS_MASK GENMASK(2, 0) +#define BMP380_INT_CTRL_OPEN_DRAIN BIT(0) +#define BMP380_INT_CTRL_LEVEL BIT(1) +#define BMP380_INT_CTRL_LATCH BIT(2) +#define BMP380_INT_CTRL_DRDY_EN BIT(6) + #define BMP380_MIN_TEMP -4000 #define BMP380_MAX_TEMP 8500 #define BMP380_MIN_PRES 3000000 @@ -406,6 +423,9 @@ struct bmp280_data { struct regmap *regmap; struct completion done; bool use_eoc; + bool trig_open_drain; + bool trig_active_high; + struct iio_trigger *trig; const struct bmp280_chip_info *chip_info; union { struct bmp180_calib bmp180; @@ -510,6 +530,7 @@ struct bmp280_chip_info { int (*set_mode)(struct bmp280_data *data, enum bmp280_op_mode mode); int (*wait_conv)(struct bmp280_data *data); =20 + int (*trigger_probe)(struct iio_dev *indio_dev); irqreturn_t (*trigger_handler)(int irq, void *p); }; =20 --=20 2.25.1 From nobody Fri Nov 29 21:44:07 2024 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 745729450; Sat, 14 Sep 2024 00:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273753; cv=none; b=QBGyFtksqwq3QEZPtYYPaCa5RmrRZCuZSDRqIiIIq9S92bDAszy2vCdOD2URPEFc5/3i1t+FProa53aRYCX2vQW2M23Uf2HTxGJiIAuDOYAX2FmqF7v7hHtnZj8OJQmHOy6+bQ4tv56xCITs7vRTlPubzh3gtaLKiWqh3OmRujY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726273753; c=relaxed/simple; bh=b7CIujmZjzUNls3049nq1FcnqWxxBaVqoHWd2s4FDi4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WkFvqSSuCCQ11jzhd6aKknISxzfBEadmosPHMuDOqk/7QjZ2morwrn/dcAohDu/NTNdyT+9/KUbOeqKWggCGWRlr5BGtQsjyndcO0if7+2lGZ/EyeSQl4o/oXSr6qid911v7ZS1pnz1OV4bI/KuwLa2vvQOzGr8+DffbJzfQbOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=avCjfNb2; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="avCjfNb2" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a7a81bd549eso310763066b.3; Fri, 13 Sep 2024 17:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726273750; x=1726878550; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aKmkeNGDuO2Aj98u7BYLTtBhG9hAadUmz/Pgpa14Ncw=; b=avCjfNb205hT1X+VGSqmwnk5BvspCL8O4Paqpt3dOU/FYg6bXmdjJw7K2RPCUKkCDL fQnnG3+DwseZhZppdr94GHVfvYKFVvxYfSE8n/b4jU8GNl5BOj16usXxNH/VYj/jnV0D yyDLK58KVZXvFS1uov47LxxTIuCezqOVuU+OfvxacE9ZHk1y5v1ouUvGzENZW++nopp/ CJLHm0A2TSIeVRfOe1qk+mMRlAQs2P5UB8Jm9AH5bLlTxBw2ocnKxS7+qhvSq7qAejL8 jJZEcikCn1uaf7VjrNl/7s0no1cRfX+UlDc9lhz+tHlxLFnil9ZtmUD7a2Db4HAJ1GlU yWBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726273750; x=1726878550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aKmkeNGDuO2Aj98u7BYLTtBhG9hAadUmz/Pgpa14Ncw=; b=WuIYUGfc3UaBgy7KyPUsn0OHJY0F3hBkKqazisjN/fIgwYp4l3tGbieFItMy9qyd1A 6e0qdAkw7jisXQDVJbuSbvF63VTk2PPJzbtT+4em/n0YU177tD8qUdXuRxF3UTdxidJa kQ4W+MdEQQDEdSO9se6TXd1CSs8+TMVeZqmIlXgH/DLqwC1LBNWJ1MUJ3i6C8wPnPGAa rKfuRXQMay63+4sdeGadtsc1+4DYKcrbO/O5iwY2j+375TI5AINVnUrZ2/sjq4aEbT0E yCSGJ0uurPkOI+nBnqe/wK89dShU9pnxgaYbl9R73hkVenHvfskHsfuivq+YEWyHfcQX 0afg== X-Forwarded-Encrypted: i=1; AJvYcCWLZkoHk96WpsyBijJw30Ezi3Bo+Te9i9jX+9FzEnrbk/pSYRHoUhtiT6BmkKcGcH/eheJLvauVSQLr@vger.kernel.org, AJvYcCX0kYys+iHZaMqHi2BYNw1FT1Qzpz1SLgU/mIX/gGgl10JOXMB/LMQwZo04PMsQLzEw4Zl2fUhCPRvH@vger.kernel.org, AJvYcCXUktEGU5jWN2tgCe2IZl9ewizLo8LyFDob1K6kw4qpjRf6cYMPWjZA9Wa+yHluck8bz0cIZhkFdIwvqJtN@vger.kernel.org X-Gm-Message-State: AOJu0YxGUu2IezEl4zS2rOJF5JdyiqWI0ExFoA7ff8BCs3VBH0gE+L1b kTuAzTs17iTBMvG7Bqg8R97477yVxjmgRT5LA7JbklGyawlkrVND X-Google-Smtp-Source: AGHT+IELJj86v/zH+YzdTlTzmIZxtEPW37u+jkNwTmMVbntfHIl7Y2AwPSvb8jq5aZyTSZYTbn+V7Q== X-Received: by 2002:a17:907:6096:b0:a8b:6ee7:ba26 with SMTP id a640c23a62f3a-a90294a88d5mr824783566b.1.1726273749026; Fri, 13 Sep 2024 17:29:09 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:6bd1:9a24:6b02:4a8f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610f43f4sm15157666b.80.2024.09.13.17.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 17:29:08 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org, lars@metafoo.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andriy.shevchenko@linux.intel.com Cc: vassilisamir@gmail.com, ang.iglesiasg@gmail.com, linus.walleij@linaro.org, biju.das.jz@bp.renesas.com, javier.carrasco.cruz@gmail.com, semen.protsenko@linaro.org, 579lpy@gmail.com, ak@it-klinger.de, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr Subject: [PATCH v7 4/4] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Date: Sat, 14 Sep 2024 02:29:00 +0200 Message-Id: <20240914002900.45158-5-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240914002900.45158-1-vassilisamir@gmail.com> References: <20240914002900.45158-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit intends to add the old BMP085 sensor to the new IRQ interface of the driver for consistence. No functional changes intended. The BMP085 sensor is equivalent with the BMP180 with the only difference of BMP085 having an extra interrupt pin to inform about an End of Conversion. Reviewed-by: Andy Shevchenko Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 63 +++++++++++++++++++++++------- drivers/iio/pressure/bmp280-i2c.c | 4 +- drivers/iio/pressure/bmp280-spi.c | 4 +- drivers/iio/pressure/bmp280.h | 1 + 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp2= 80-core.c index 58ff77cbee64..5bdf44c12ec3 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -3058,13 +3058,16 @@ static irqreturn_t bmp085_eoc_irq(int irq, void *d) return IRQ_HANDLED; } =20 -static int bmp085_fetch_eoc_irq(struct device *dev, - const char *name, - int irq, - struct bmp280_data *data) +static int bmp085_trigger_probe(struct iio_dev *indio_dev) { + struct bmp280_data *data =3D iio_priv(indio_dev); + struct device *dev =3D data->dev; unsigned long irq_trig; - int ret; + int ret, irq; + + irq =3D fwnode_irq_get(dev_fwnode(dev), 0); + if (irq < 0) + return dev_err_probe(dev, irq, "No interrupt found.\n"); =20 irq_trig =3D irq_get_trigger_type(irq); if (irq_trig !=3D IRQF_TRIGGER_RISING) { @@ -3074,13 +3077,8 @@ static int bmp085_fetch_eoc_irq(struct device *dev, =20 init_completion(&data->done); =20 - ret =3D devm_request_threaded_irq(dev, - irq, - bmp085_eoc_irq, - NULL, - irq_trig, - name, - data); + ret =3D devm_request_irq(dev, irq, bmp085_eoc_irq, irq_trig, + indio_dev->name, data); if (ret) { /* Bail out without IRQ but keep the driver in place */ dev_err(dev, "unable to request DRDY IRQ\n"); @@ -3088,9 +3086,48 @@ static int bmp085_fetch_eoc_irq(struct device *dev, } =20 data->use_eoc =3D true; + return 0; } =20 +/* Identical to bmp180_chip_info + bmp085_trigger_probe */ +const struct bmp280_chip_info bmp085_chip_info =3D { + .id_reg =3D BMP280_REG_ID, + .chip_id =3D bmp180_chip_ids, + .num_chip_id =3D ARRAY_SIZE(bmp180_chip_ids), + .regmap_config =3D &bmp180_regmap_config, + .start_up_time =3D 2000, + .channels =3D bmp280_channels, + .num_channels =3D ARRAY_SIZE(bmp280_channels), + .avail_scan_masks =3D bmp280_avail_scan_masks, + + .oversampling_temp_avail =3D bmp180_oversampling_temp_avail, + .num_oversampling_temp_avail =3D + ARRAY_SIZE(bmp180_oversampling_temp_avail), + .oversampling_temp_default =3D 0, + + .oversampling_press_avail =3D bmp180_oversampling_press_avail, + .num_oversampling_press_avail =3D + ARRAY_SIZE(bmp180_oversampling_press_avail), + .oversampling_press_default =3D BMP180_MEAS_PRESS_8X, + + .temp_coeffs =3D bmp180_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL, + .press_coeffs =3D bmp180_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + + .chip_config =3D bmp180_chip_config, + .read_temp =3D bmp180_read_temp, + .read_press =3D bmp180_read_press, + .read_calib =3D bmp180_read_calib, + .set_mode =3D bmp180_set_mode, + .wait_conv =3D bmp180_wait_conv, + + .trigger_probe =3D bmp085_trigger_probe, + .trigger_handler =3D bmp180_trigger_handler, +}; +EXPORT_SYMBOL_NS(bmp085_chip_info, IIO_BMP280); + static int bmp280_buffer_preenable(struct iio_dev *indio_dev) { struct bmp280_data *data =3D iio_priv(indio_dev); @@ -3262,8 +3299,6 @@ int bmp280_common_probe(struct device *dev, * so we look for an IRQ if we have that. */ if (irq > 0) { - if (chip_id =3D=3D BMP180_CHIP_ID) - ret =3D bmp085_fetch_eoc_irq(dev, name, irq, data); if (data->chip_info->trigger_probe) ret =3D data->chip_info->trigger_probe(indio_dev); if (ret) diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/bmp28= 0-i2c.c index 5c3a63b4327c..2f7b25984c7b 100644 --- a/drivers/iio/pressure/bmp280-i2c.c +++ b/drivers/iio/pressure/bmp280-i2c.c @@ -27,7 +27,7 @@ static int bmp280_i2c_probe(struct i2c_client *client) } =20 static const struct of_device_id bmp280_of_i2c_match[] =3D { - { .compatible =3D "bosch,bmp085", .data =3D &bmp180_chip_info }, + { .compatible =3D "bosch,bmp085", .data =3D &bmp085_chip_info }, { .compatible =3D "bosch,bmp180", .data =3D &bmp180_chip_info }, { .compatible =3D "bosch,bmp280", .data =3D &bmp280_chip_info }, { .compatible =3D "bosch,bme280", .data =3D &bme280_chip_info }, @@ -38,7 +38,7 @@ static const struct of_device_id bmp280_of_i2c_match[] = =3D { MODULE_DEVICE_TABLE(of, bmp280_of_i2c_match); =20 static const struct i2c_device_id bmp280_i2c_id[] =3D { - {"bmp085", (kernel_ulong_t)&bmp180_chip_info }, + {"bmp085", (kernel_ulong_t)&bmp085_chip_info }, {"bmp180", (kernel_ulong_t)&bmp180_chip_info }, {"bmp280", (kernel_ulong_t)&bmp280_chip_info }, {"bme280", (kernel_ulong_t)&bme280_chip_info }, diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp28= 0-spi.c index d18549d9bb64..49aa8c2cd85b 100644 --- a/drivers/iio/pressure/bmp280-spi.c +++ b/drivers/iio/pressure/bmp280-spi.c @@ -114,7 +114,7 @@ static int bmp280_spi_probe(struct spi_device *spi) } =20 static const struct of_device_id bmp280_of_spi_match[] =3D { - { .compatible =3D "bosch,bmp085", .data =3D &bmp180_chip_info }, + { .compatible =3D "bosch,bmp085", .data =3D &bmp085_chip_info }, { .compatible =3D "bosch,bmp180", .data =3D &bmp180_chip_info }, { .compatible =3D "bosch,bmp181", .data =3D &bmp180_chip_info }, { .compatible =3D "bosch,bmp280", .data =3D &bmp280_chip_info }, @@ -126,7 +126,7 @@ static const struct of_device_id bmp280_of_spi_match[] = =3D { MODULE_DEVICE_TABLE(of, bmp280_of_spi_match); =20 static const struct spi_device_id bmp280_spi_id[] =3D { - { "bmp085", (kernel_ulong_t)&bmp180_chip_info }, + { "bmp085", (kernel_ulong_t)&bmp085_chip_info }, { "bmp180", (kernel_ulong_t)&bmp180_chip_info }, { "bmp181", (kernel_ulong_t)&bmp180_chip_info }, { "bmp280", (kernel_ulong_t)&bmp280_chip_info }, diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index 0c32b6430677..e0e47bf22472 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -535,6 +535,7 @@ struct bmp280_chip_info { }; =20 /* Chip infos for each variant */ +extern const struct bmp280_chip_info bmp085_chip_info; extern const struct bmp280_chip_info bmp180_chip_info; extern const struct bmp280_chip_info bmp280_chip_info; extern const struct bmp280_chip_info bme280_chip_info; --=20 2.25.1