From nobody Sat Nov 30 03:31:26 2024 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 EF0791C2DC6; Thu, 12 Sep 2024 23:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183966; cv=none; b=srNSbVJGGEU+5ovwgicq5hIKXWaPTEkKA9vpZZEyJr5KN9rYcX8OqZv9tNa80LEIotJHQYb2Fgc6wGrmLH3l9nn9+QMCMBbyoAXD3KrTsxDdxAPZ2qeBL8ORYxnXZ6fSvXp2NbHQAZBQtBdwLGRiQ5yM5qZAR4Kx+/vKpK9cq/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183966; c=relaxed/simple; bh=BgIiCofC3RaGzUum7qBwbqVJXuYfDxgH2+7j6Glr94g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l4f3paARU83ZHgfWXmTft8k+sllAPVLfcqTAxRjRcTyUJ6JWObifR6NBE/hhP9/+Q/g7MnZ9vo0PW6oC9lwckwEh295bJg7yMxXs2Q0rJ9gohRIcS8CIcIVu9PwZSKswi0Jvg7gFYxaSWenZZEeKGIfuSGkTVMJJId0i0Zo5DFk= 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=LX5QAHFp; arc=none smtp.client-ip=209.85.221.44 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="LX5QAHFp" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3770320574aso1072526f8f.2; Thu, 12 Sep 2024 16:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726183962; x=1726788762; 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=ECxjLgS4v5RwRS/ciOtp4sRRcnbKzclwEX21qyNZC78=; b=LX5QAHFpqhHpvbm6HE888kfEZ0jdLfMtQZ5FU39LZlFfAImFxL+mMQxNsYEIGukM7h cpfQLStRbaCAS1egTt+kC+1o8LLtag6s/LzsdHU93rk+oCnMWuTnMwXWsXAFK/cLBCVh HChU6zd5w+9g/jCyS6AgT/TaB8oI4EwSrQYv/JCnp9HZggIRaUUeF1bxMSuSkAWm6kDc bouoFgwHNaBhExg30O5EhAOn9aQvgSU+qVNehVjFRr+tiXyQj0U70izghWhrhleTWNLZ 6pSghPYhrWE1fW+Z3eJFBDFVjmWBP6f8EPkRfgVGpRp5PAA9++oNepwI7rDNoSIxuWJe aqjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726183962; x=1726788762; 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=ECxjLgS4v5RwRS/ciOtp4sRRcnbKzclwEX21qyNZC78=; b=uQRRaw7hXD+ZXeD65vRINdtKgWo3QRwuf92DajgA7aMEF7mdgxyO0rhTSKzvQ3tDPH qTZL8zxFVqyzCvqJvtp9pmsRSYovg3DFfk8wFPTK9IXCwwhfX8d/iRuMDZN3vzxrxuD+ 7mQIF4a/nTLdotq+cDaJeQDS3GPRBTU+B9NSLH++kNVMcAN7qeTQWsuC5hSxUrysMLwp kF/ifG0V5xhrs1mijSsmKOY7BG2oKw3tx7Y1iO2F2Kc7YmDs4yqxcgwJhTAbhLYQahQd ZEK6M1r9u58oQuanTmlD9umtAmyTE3R7HBMgZb7Y2H7HL4GTldiGYjgUJU38YZ0/u16K kyBw== X-Forwarded-Encrypted: i=1; AJvYcCU1QqrI6Kr1Tb2ZuPEPi3tzfxAdMQnB81q82EszXljMKbBbK6RUuaezpDiYXpiwOoJI8a2KsDG1NxHx@vger.kernel.org, AJvYcCUUxGEP5R9T1+NvoDY+JD51S+Et1jS+bn8M2HHpFv1P4DIJ+uHI6FS+tOlBchQpUnWx4wSuI8UhTXxW@vger.kernel.org, AJvYcCUWc3c50/Qpu9EH418ZFHbtcpYwkJ1PSlvI89I2j/Z+lg5PlakhKI7QNjF4KghOz1P3wepia5kFq3YAxJNb@vger.kernel.org X-Gm-Message-State: AOJu0YwqSN5kQ5ZyVgCiFv0/11NwKkhdEjEN2RFZivbZVxx1aRiFAvRG JbIuWIByzvmNNBsjTYwsZqjs8BMSRNjBS84NLSUORpH2AJ1vXuxF X-Google-Smtp-Source: AGHT+IEZh82wFVycml57sYW9EjDH75PLAm/6vq9KmyEIKeo67tEiWrsneBpFonvrf1Pco33KUqgBRA== X-Received: by 2002:a5d:670c:0:b0:368:6ab:ba69 with SMTP id ffacd0b85a97d-378c2d11947mr2761845f8f.28.1726183961979; Thu, 12 Sep 2024 16:32:41 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:85e4:cf41:16db:65d5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c421aab306sm26693a12.73.2024.09.12.16.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 16:32:41 -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 v6 1/4] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Date: Fri, 13 Sep 2024 01:32:31 +0200 Message-Id: <20240912233234.45519-2-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912233234.45519-1-vassilisamir@gmail.com> References: <20240912233234.45519-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. Signed-off-by: Vasileios Amoiridis Reviewed-by: Andy Shevchenko --- 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..8c87f7ef28c9 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 5000us + * in order to go to the sleep mode. + */ + fsleep(5000); + + 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 Sat Nov 30 03:31:26 2024 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 A72891C3F25; Thu, 12 Sep 2024 23:32:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183969; cv=none; b=npP118zPASWV4nc/4vejLw8IXdVw8U7a2UcqZyOzWMlBNlnqaj5P2+2dd+oIAK+uGsFLzj9IBtblDf2gqIwiOY6dKQ0RKbz5AojouIRGRsqaMHykRmt9X0DI1e1ZRQYjeslTMJFE1uWoKM/Nftpvot2u8NW09zuZuI3g/ygQ8DU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183969; c=relaxed/simple; bh=4Zib+Gb/hQHqWXzxIVj/h9hq5O/XYqF/fMs8xGJqk98=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U2sIv3Egkz4+yEBtK+Ecx03tC3+/Y2y9Y8yQ+5/f8q3BhPZrJzQtgvPHFHBwL5HyL7cSzYBqkPlhq0Upk5uvDRkXswLi2HQm5QGOk++9k9RHhzeduKwMNU1oRsZSBdKSJyhkA7jrPg6/8gwoeq8PtoC5ZIrn4qNyTq4SG0WCN+0= 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=PW33UzEb; arc=none smtp.client-ip=209.85.208.42 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="PW33UzEb" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5c241feb80dso5096250a12.0; Thu, 12 Sep 2024 16:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726183966; x=1726788766; 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=QGvQpULdNzcr76UYmbt1A1/lsWBEjEt4/IrCfIC30I4=; b=PW33UzEbZ/O7pdIsC/4IoUmOHdffijMk2Jve4BPCJJ1Wew1gIqQw8BP7kcrJaiUVBX iXjVvyhza9XqSvGVlY4Rw6OaY5Arn115bL+sontWpEPQjPeRGhOMHuN5oHhwJGASwVR4 oxTQ2WbOjLScEPm4mIXEUl8UcZE8cElAD3mk70YreGQzxA4apFyKKOp9ceqfkPJy4qDc VTZhKdIdiJfjcnmp87dlAEEfMNEj2wzpLap5r85UvgwVkjvE7tCNkhEQhnKmZcbuqUVh EMY8bA4bgYkHQ7xwH+mAhq4+2A9C1mRCsDouKttCgkWp3qv25jD6NlRMBxS37wFr0k58 z9vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726183966; x=1726788766; 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=QGvQpULdNzcr76UYmbt1A1/lsWBEjEt4/IrCfIC30I4=; b=T7+yOMaG9OnZgAYaZLpWcz1wftllfAVxL5qzotFsIhCdalVLQzUW1y8xKZ+U3Q4QRd VpfXLS9MdKf70aObdJCf91Lx/+/sIUnOr+6jwAb4OhPRETO2SlbOrj1Wl8dT2jeUgeT/ Nn+EpWiGOhBk40ai6OeT6QtzHRH9WX2nvIzUhlt/aoGxID5GdMywr3rC+XM0cKiqRc7z h5OlbARQBrMFgZll4wJg+1WrVY+0C2xjd9zgn53t+bl0lA8GV3QLxH8xlxK8VVgxwD0Z bkdHiqjcz285iIfC5rE4HhEjVQmw7ugoUKpyIoOXnNGXu7IAiZdlVRVHP3WrZMZL4mem /KsA== X-Forwarded-Encrypted: i=1; AJvYcCVLqpU8YKLTds89JryU7ksRgbyfiPDpjSozSz+r1B+xMnqK+eQB01thgT2gF5KXVDiS9Cbtos1WiUNM@vger.kernel.org, AJvYcCWGczGel8/u9XLQFg7zkR0aKaZXc0Z2CPR1Q/9S0EkKjW2ZIs1zdwgHENQHI7RaHO+UgtBv0HU14Ro1@vger.kernel.org, AJvYcCXN8rbJYOhd3BuU1ONHORQQdgf+vdYWSJaynsntHWRp/TehKufyz724+REf+cYfegR+DPH8ly5IXA2ZQnB/@vger.kernel.org X-Gm-Message-State: AOJu0Yx7JuBsGEMl3gfhQ4ayjEtfr2OUVhCAq11y6L4fQXLWiYuC9Qga hUXC7MVhwK4sbGbeckPmmwIVV3gtBjvZ9bukMGPre6cmZRzhHYCL X-Google-Smtp-Source: AGHT+IF6nXvYYYOzkAuMVYzcgoB8+Q3HROdZ/YX9fy2WHR4M5/r74XzGdPToKmN0WIe0HZdzudQVlA== X-Received: by 2002:a05:6402:34c8:b0:5c4:8bf:d709 with SMTP id 4fb4d7f45d1cf-5c408bfd8e3mr10087355a12.13.1726183964965; Thu, 12 Sep 2024 16:32:44 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:85e4:cf41:16db:65d5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c421aab306sm26693a12.73.2024.09.12.16.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 16:32:43 -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 v6 2/4] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Date: Fri, 13 Sep 2024 01:32:32 +0200 Message-Id: <20240912233234.45519-3-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912233234.45519-1-vassilisamir@gmail.com> References: <20240912233234.45519-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. Signed-off-by: Vasileios Amoiridis Acked-by: Conor Dooley Reviewed-by: Andy Shevchenko --- .../bindings/iio/pressure/bmp085.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/D= ocumentation/devicetree/bindings/iio/pressure/bmp085.yaml index 6fda887ee9d4..7c9d85be9008 100644 --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml @@ -48,14 +48,34 @@ properties: =20 interrupts: description: - interrupt mapping for IRQ (BMP085 only) + interrupt mapping for IRQ. Supported in BMP085, BMP3xx, BMP5xx 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 Sat Nov 30 03:31:26 2024 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 586C91C0DFD; Thu, 12 Sep 2024 23:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183970; cv=none; b=Azocy+meS+7hFsbWrEPNvHYP3l1c66zmRw2HtSxNc2/eW+EO1FJfBjlL6IFJjNSK0++d6Wtm+cPGT5tevD59cMguQUNfweFGxyT1nDgbUH7vISVo6mblRcxAaA/ecb0prAKUiChF/DLlUijP71xihv/QmHh5PzCNvTVYFf3IOXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183970; c=relaxed/simple; bh=qEJ542XnBjhrDL/O7bdfsuCoFZ7/rQT2bh6jI/PXsKM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=avJyOO7T6TfiGUmn6ZiGFk9hKWm9pkqtuh0Z9c2te+2I5IQI2fYY7yAs95bC4zEywPRrBlg5/f5NOxp2Fy1NCY8qoXdgpwAig+W2K+noWUFUjlPlzZwL2LaHinv/DyIohbdlK6RP9CoWkwZjCIpHu++QpP6dV5XhTZSK1ngw5Ms= 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=UKpbgTtt; arc=none smtp.client-ip=209.85.208.44 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="UKpbgTtt" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5becfd14353so356231a12.1; Thu, 12 Sep 2024 16:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726183967; x=1726788767; 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=b3fSSD0N3oTM7g9/QwYCGfPDW5BuBlG839mrMECL4GQ=; b=UKpbgTttHX6SI4mQBWO49xUBqiMPwEMmNMKZrMQsaZuKyJVBYmWSXVq/isqCnKCBsw /ojuB8ap2J6FYangZT/fIMfQaFSYI7j9QL7gSSOnjLlTqoBRxzZ3WKlPGfMvaOH2sbRC m3xKHZrY8d24B7ZG2d8HaxmTEQUhQeBqMuu0Crp09jYx8IUSR20KALA+lbJ5OQrfyR3o WTQnaB/tL55ogkLejR5OExwGo1aItSg823fNEc4K38UOOWRda0WyOaBPYiys409ZGAry B+IVMyZTUVfp/poQXsEyxtTFiSbfd2KjKvjYDjHNKAOoF40WjqVf+IORV1IzoJN/hzml 7Nng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726183967; x=1726788767; 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=b3fSSD0N3oTM7g9/QwYCGfPDW5BuBlG839mrMECL4GQ=; b=JAzDfHCZJbTpjhkL8MFUTvXrqg4eGsO/15kX7cZGMA3Vwh4r9+p670yGFmnIZrMFZd z1XHLrI7hA583OXfV8KP7DX/3/BJHpyOH9Ejqa6oajftJSnUcEixMt86+Uu5012sAYkO MpzOF/9x6zkFhVGqJt7BZswXz60htXKcF5zm5iJoi5g2NX/zDZ2R4Yb07c4t1X9lrYDG rdBecHZOzeSUKzX18VndOg7onFxt2ihGAmDu7vi6wxcEWhaCKd2Z8FJR0dFEsAzDH/Yr J1Exmx8cQ6p+rcG3X07ZE/b3KTX/xyGAuzwgefenrWtqpAo6uMpJF7yFH3cZWsJzlJRo bhnw== X-Forwarded-Encrypted: i=1; AJvYcCUDk6S1JxiJ/vgrEbxFy1zdEnaUNa6SHruiIgB0JoJZzCAt64qr4v/R+Zl3GuQJj67S19lXJ36ibj3p@vger.kernel.org, AJvYcCVTMTbDjJLsvXSWnHO5l06hxDr/tYHNDKUWiHw9eqcFHgVGwlSxLBY4A1+US1YjiPTojiEG+eJByK3DSTl/@vger.kernel.org, AJvYcCWo8A8M6SMtXgtCUUCEnSyzpc5Me4xbAgvuVkyfqzamdT1cXKaZmIBydWQ6ziWX1v7TFIH5usoZ/Xa/@vger.kernel.org X-Gm-Message-State: AOJu0Yxab8SjaAzosy62X7zmSSnk7t+sge/wfunLUXKBWhHG0De70qI8 f1ItNj7yQ0IN8LfnQyC31tXqZRLhwuAjeU/Cm7VnEZuJHd/mmelwI9bVSvn8 X-Google-Smtp-Source: AGHT+IGenkjEZ9iPYzzQ53EWO3gfWZR5S3ReCPXsdQk3v34mKgKb+DNAYWlvKA7k91POyeaMDxgTJg== X-Received: by 2002:a05:6402:270a:b0:5c2:50a2:98a2 with SMTP id 4fb4d7f45d1cf-5c41df9e26cmr504183a12.6.1726183966120; Thu, 12 Sep 2024 16:32:46 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:85e4:cf41:16db:65d5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c421aab306sm26693a12.73.2024.09.12.16.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 16:32:45 -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 v6 3/4] iio: pressure: bmp280: Add data ready trigger support Date: Fri, 13 Sep 2024 01:32:33 +0200 Message-Id: <20240912233234.45519-4-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912233234.45519-1-vassilisamir@gmail.com> References: <20240912233234.45519-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. Signed-off-by: Vasileios Amoiridis Reviewed-by: Andy Shevchenko --- 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 8c87f7ef28c9..0edd756ef8da 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 Sat Nov 30 03:31:26 2024 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 650D31C4608; Thu, 12 Sep 2024 23:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183972; cv=none; b=GKYjfMwru5X9i6InS24eb0IGfEefEDK/PMVs5nsHr1y8SqZueQyonHD/SmIl0lsqKq7JCI0ok8zihXIrL/Zw/sMu6LKK2Nu/KFBto97c17i2xnrjeWr1czpqkZDiza+z/uWUsiWvl39afWqc6DklqK++8Vl/G8luBPhoz8nQg5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726183972; c=relaxed/simple; bh=IMdK6CM7n2UE2KTXgKXeKu13+AE6eDtegLqiRQZjprs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IvZmMaSrbJj7RRcr8iDgv0y4d6W1hftAxJzUCXHA1NEo61A0wMtQXfTWnDn/ZtjoT1DCw2tW12ZtTEQ8i9jL8MN6R6g4ItqXNB6hPYfZdOwxGvVoia68Gqcx4B1e8wZk0i9XnjOKQvuQyyJEcFNqZ9p5hkEH/hXqVhoSpyanqpg= 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=g503qOO0; arc=none smtp.client-ip=209.85.208.51 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="g503qOO0" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5c40aea5c40so2546188a12.0; Thu, 12 Sep 2024 16:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726183969; x=1726788769; 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=qqwQ7JL7fOO85Nb8rlmfepwDiK0LjY4ueeTzmShtwSY=; b=g503qOO0ukknhvMrtFZxk2ao4lEVWSgpdo0J3UrWMeDMLEvb9h5dUeVVix6HxmeGoE TKrvEq+0o7r1EpcF+7N42wQrL9OaQ1EeoL7015pIBHPSu62W+elgiHPbc8R8sHqYRRmp GcBzNHuHA1OMP+YcB6solL70NLyBLXHLXQekZxQXXLDCsisgCNlyIA78CZYZln+JNJYp Le+5f93qpd59BPBKNrZGmAF8fNJ9SKraaDeixlLuaYnwbsv8QfbpZTZXOGL/aNuFNeIA wpgO7sOaRNuaMlN7twbTmSoZZzLvhJlAgvW7++FlOEVOR9UAHNQjegqLT6L4ZdJxarts OZIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726183969; x=1726788769; 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=qqwQ7JL7fOO85Nb8rlmfepwDiK0LjY4ueeTzmShtwSY=; b=NswY7n7+PKYwpxTR8Z687wU4pnAw0V+3tSELMPzHTN6d/Cd26qIxt/77Za3tNGgOjc bRnsSQWlmVoMVkluMzhy9G2Ts4EDpZ9CgS5BO1ykOu68vTDWSVs/IIQhUMfzT271yzX7 hoslj0xK/nqGoRvcEGdqHV5eFKnDbaWpM5RGfT/ZaX2WIdkNjiY1hbQg2Xd4q6qg3hON qyLx5ZiTRBQP2il5GubgxsnA/pZiJdRdr0Jfqa5GO7QzeKPQilHKHy1LDCa80f5s+Its vcuWHuGqeijKs0bNXaUcS3Kb5AfK0LIdciuZ6er1Za11i0YXyODfxB6ogpoTLT5MMKdv yD9g== X-Forwarded-Encrypted: i=1; AJvYcCUDi86BxWOotdUALYYUt3dsLqnQr5Cf+Ebu+eeISVThnkg9iaFhiL1jBavTu+f44xV96+ud0kEtyhXRlOb6@vger.kernel.org, AJvYcCUkPgq9lTIR6V3EWTgiEXXGG71J+Zlx55vv5f7p5WmDyHKQzUX37Rg3ojMwHtym6x5XmznaMacAdqKi@vger.kernel.org, AJvYcCX/pDIakYwg7Xypi1bXOzxQk/sS9aYIdQKfEefJB281omfXn6DjAtiZx8mV9A8Cx3AJQDq7/Flo0K6r@vger.kernel.org X-Gm-Message-State: AOJu0Yyy6M4QRKlrjk8J0L478ZfGDeg4FCvPUL1WoV4rAq9cVfUogjrc Qsx2vdSXe0zkHMH82IiS7JA65thYgAkDpNvwEv95VOMSW6EBNZOS X-Google-Smtp-Source: AGHT+IHF7VO13uxY63KCiCGO9v9jWvCm9YU2OPyA6MrGU4lyy0vBBEizw18TpccAmE3zjRP/UN/RGQ== X-Received: by 2002:a05:6402:5c8:b0:5c2:5254:cdc4 with SMTP id 4fb4d7f45d1cf-5c4143874bdmr4320041a12.17.1726183968173; Thu, 12 Sep 2024 16:32:48 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:85e4:cf41:16db:65d5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c421aab306sm26693a12.73.2024.09.12.16.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 16:32:47 -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 v6 4/4] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Date: Fri, 13 Sep 2024 01:32:34 +0200 Message-Id: <20240912233234.45519-5-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912233234.45519-1-vassilisamir@gmail.com> References: <20240912233234.45519-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 0edd756ef8da..c949faaf5869 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