From nobody Wed Nov 27 22:26:03 2024 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 E5ED51DE3A0; Mon, 7 Oct 2024 19:50:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330608; cv=none; b=o4JTMGqKCbFHqcIUF7tmKbsHtnvJ4SN3huSzZdl8o+XD8BZJpHn/yzFMK5U77JCU76kpDUFQDcDwArnWiqRPevoWfVQKLXqfT2fqC5efufJQau/wua+aZDhzDAq5RZz2vaSDi/IPpI7hJolCJt+HSqFQ8yZZRgetyKfVshy0jew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330608; c=relaxed/simple; bh=e5aqQiWYjqFkKWJWIUPCPnYaXADocIOOVQXxCIqkaCc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MTqVcUNA9ZDZMJ8NTJMgAKpXqONmw1wC8NkGE7MsMBt3Oshu4FC8Z2RfuZUVJUFRVEuw2GvT7qdYfsUMUxQVAXMuG/AZTFERJdytqTaSJgfR9OIHxiP2nfpjAP+V/S5l9tt9rG1RWCv/DCDuAeORaZuTPHN73xzK6TFakJQ8VlY= 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=X2mHYAhT; arc=none smtp.client-ip=209.85.128.47 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="X2mHYAhT" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cba6cdf32so49100875e9.1; Mon, 07 Oct 2024 12:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728330603; x=1728935403; 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=gBviQl+xMENFFhO5gRANysmLURmvqeJEfybZSgzUTSI=; b=X2mHYAhTGdA8uAhU+LtxeHFxvyTgeneSvb9JdmWWZ/ZIhELXtTU6NiCeezi8CiGkXS am7bShzefUGPnuI+518qX3nePOhB2ee0yW1oxSmDxfAflQPI2FLf2SxLR1IaoHsA+7KX TJ2ehaRK5vd0B302KbkR8p9BPVSizt8lcNJJFmQANNQ8Fp4pXAFEfqYX8LPxNPCpWOhG 6Eqi+oy6ncb03EeWIRX3alw3ohsFMy2q3J/OMdQC6ILjuwj6J0m+bqnYuVkN/iwVh3Op 4ptXFuvvKMlOeclCnCK1nAa90n8593wCfucQlEwQzzjgFBx3FbKwujAQaUC6emFfl60j Skew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728330603; x=1728935403; 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=gBviQl+xMENFFhO5gRANysmLURmvqeJEfybZSgzUTSI=; b=DWyq0xQ/Sd3MWeoSINrWepJHJHBwvUsyn0FLUr9cGouvXKEol2/ikjXil8ygbXzXan f0cghWZGw01GtB8m/5I95mY8SqJe5rcN1A3gukX0F3hBuFO5of5xxIRbN/n4hQgzk/+z ntEkBypYquKgfqAAs8bFfOKjUZy7RlpCcYkPo5lxXeIZlUAtnutyzUcKQ0+zQ1rolchk lN3buwqLHZsVMA250SOtwFDfrbHKAWIKZCgBWrfiyTrFa7t3MKDTp7uslza+9aXUDxpG nyzyTME7xViMPmAWqIg8x5wiF/KVOH6G5erztDssosmIOD4SE/pUkZQDMJ27KkdqT7Vi yCZQ== X-Forwarded-Encrypted: i=1; AJvYcCUWF0yYEZyNGZY6Ogu/E0lUlS0YQ1aUhNB+/0DraLqndgB50PkfH1CTWMc/Pi+Vza5nnsoLWauSB8v1@vger.kernel.org, AJvYcCUwr36xUVjZF2T6K3QHRalPFk5o0goWi/Sy9EDi+dWi9qMCtZdi3sxZfEFSUKnpy2sW0gwLNc33iG0R@vger.kernel.org, AJvYcCVYVfKOTLxI56JYkhc8AQ5iVB0QnQ9xgmDG299egW7xkvOOqZJXnvbo2bb2cqhGvVBMBoUUtqZ4mNW6UyMe@vger.kernel.org X-Gm-Message-State: AOJu0YwP3rdJGNMgkNO42E2M3NvppUg6zo7JvttXOTz8mUdPECcpBTSy zNyrnHvZ4vpaghnX5C6ElShM4dJ2PyXkL543Mzw7vbajXZML5BqT X-Google-Smtp-Source: AGHT+IHQf5iY4kGMDZZk2O0y38CZ3F1cqzhCn7Nysea5JU0X8GD99x3NLuYPUar+6riJmLwMxTN/ZA== X-Received: by 2002:a05:600c:44d6:b0:42c:c401:6d86 with SMTP id 5b1f17b1804b1-42f85aea06fmr92311005e9.27.1728330603049; Mon, 07 Oct 2024 12:50:03 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:b658:eac0:bb05:9042]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed922esm84939655e9.39.2024.10.07.12.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 12:50:02 -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 v8 1/4] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Date: Mon, 7 Oct 2024 21:49:42 +0200 Message-Id: <20241007194945.66192-2-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241007194945.66192-1-vassilisamir@gmail.com> References: <20241007194945.66192-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 6811619c6f11..9ad29cf4c2ac 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; @@ -1111,6 +1195,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, @@ -1235,6 +1321,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, @@ -1522,6 +1610,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; @@ -1582,17 +1735,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; @@ -1618,7 +1773,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) @@ -1714,6 +1878,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, @@ -2101,6 +2267,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; @@ -2171,17 +2406,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 @@ -2279,6 +2503,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, @@ -2526,6 +2752,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; @@ -2597,6 +2836,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, }; @@ -2649,6 +2890,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; } @@ -2819,6 +3061,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); @@ -2844,6 +3090,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 @@ -2858,7 +3107,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 dc1bf04cb0b5..3babf90ce73c 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 @@ -385,6 +395,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; @@ -423,6 +439,9 @@ struct bmp280_data { u8 sensor_data[ALIGN(sizeof(s32) * BME280_NUM_MAX_CHANNELS, sizeof(s64)) + sizeof(s64)] __aligned(sizeof(s64)); =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. @@ -487,6 +506,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 Wed Nov 27 22:26:03 2024 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 BDEC71DE3B8; Mon, 7 Oct 2024 19:50:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330614; cv=none; b=PPIZg7Hcpg3vKx0IXO0wdPX3gBVhcdPUp7G0mCo2OSX6KdsGiPZ2sQs87c0ThQW45k91UTp/n3xxujM+92w/BozbUXmbpOXuinASL/HaUF/wf/NWGq56QohxFp1YEvy9vBreRLjEeyg8DORs56AqNGPfUj3HOkghhA+GrF+0YrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330614; c=relaxed/simple; bh=7uC/oD/EC1yLWS+RCZzt3d9PsCUcWXEwxeyQTHW1eqM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=feODwzdgZspxPpkkTdVkopJagJ2KWTdyXt8aaM5Po++0cZ/ZcpUFgmRvDDLm0tgjgPsCz8bQnWPyYRalLC6VXMzd5RUG1lw0uRSGztQtLKidngLzy+dVmiILac5aKP4QIuq+M/mW3fW6vo0H0IZ8tyo0Shse8GIFcm6uFXdj+78= 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=BO2BsKNH; arc=none smtp.client-ip=209.85.128.43 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="BO2BsKNH" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-42cde6b5094so49011455e9.3; Mon, 07 Oct 2024 12:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728330610; x=1728935410; 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=BO2BsKNHHGmAexSbB3uc9y5LzhBzbbxPfXDweNIRtsFkEdVyAGf0p3bXXNLsp8yOdD bZoEsbqimlUtRXENVXAH+VWxgaOZBjh7ZdfwQv35aVVs24c9GRkk8Xnr8+Pi493lbuIg eMvmd7vc3tRRYLCT4gw1b7EABsD/NqptzmXUBurHhUHiDtTU0m1yfkLaBPUzTvhCmrRP fU4bR5DmTiP43EhisZEfuNjpe2wS0QQ3aycs2IT0TrMJBUNo4NYmE7ExG0SX8ThguRxp yeemTA2ki/pX4M63pCriWK94HXhrKx11+ERcFTZOqWGhGFuQ1G3uPOVsXstfb5/2vHdf vOVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728330610; x=1728935410; 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=GMAb9yizlWaG+kXqwKN6cpnDcMhIMtUBV4JCgRv4p/rwhTjZ2XQtQS3LC+yqyur4jR gY4IzsSzIm0VPeeRT9Lwo6xOHu7U+8mRKUpybZjUbqG/veXwiVnk62wj5lpsQOrMhaf9 Imw0ejClm1YWeBFx3yVmXG6zi2D74wDJr10k55AZ7oGwqJb7/e4On4A7pGXH0b28QVqi oClYQy3kMTa+fYdr4pdoocxCRquaEpX2L8AcgATpzqlFwCQfwM7GBha2icdmpnFx3SUu PQ1AXZWowD2oDgc9W4xeLvIl4ZNDrS3232Y7aJnjIfV4onYWYxKXvnsf3WXvhSueXZjs adBg== X-Forwarded-Encrypted: i=1; AJvYcCUpS8V+xwCixhi4vPI2i4jL6e10KFrabRvywkk/Ip+1X/n3Cy6imgiiNA8Gvs5fZTFzdxScL674vxW9i0pA@vger.kernel.org, AJvYcCVL9/j33COV3/zQYAQNBdnCgMxVJmPzkhDXL5S4ZB/FZNUVa54891R6UdiI4jkFJzLVoRSPJ9t2DZUa@vger.kernel.org, AJvYcCXi9DrkPpqklfodEaBN4x11a9jaa9B2aSovCzedo221hfBoMVDiD3nUqkNkmqw4pk8BKBCxzNik41OH@vger.kernel.org X-Gm-Message-State: AOJu0Ywdy34PQfntZpkdcrIl9iF8AtziEGoZvotzkjBZOMwyUWkt30wT 0ZnbA6Y88LVjAEipfAp9eMxfaAgSUvjIpC2KyYWvqWXfiuneIh6a X-Google-Smtp-Source: AGHT+IGr6AYYUcbqeGRNkgSvINIB3ve4a0v4dJkw7TVZoS9rdzu+ns+6sGkZ+NFq+mSf94LTZW/cYg== X-Received: by 2002:a5d:4e4b:0:b0:371:8319:4dcc with SMTP id ffacd0b85a97d-37d0e6d862amr7319693f8f.2.1728330605405; Mon, 07 Oct 2024 12:50:05 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:b658:eac0:bb05:9042]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed922esm84939655e9.39.2024.10.07.12.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 12:50: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, Conor Dooley Subject: [PATCH v8 2/4] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Date: Mon, 7 Oct 2024 21:49:43 +0200 Message-Id: <20241007194945.66192-3-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241007194945.66192-1-vassilisamir@gmail.com> References: <20241007194945.66192-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 Wed Nov 27 22:26:03 2024 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.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 376251DE4E0; Mon, 7 Oct 2024 19:50:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330612; cv=none; b=pE4hE1tGxPS+ya5+MWa90Q2S64CPaciqqyvgwp2hLRa4o/z7ECMeXhESsRjruaNakPdT9RT/YSDdw7/dsz0ttIozfUg0tTsTCtC9Uc2t7fVYjSSlK/DpIJNy2MSdhSJyoSSLXr5kQ4VHNBjxSI6JcOITdTxhF8B/qYRgMz18gYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330612; c=relaxed/simple; bh=sZyzGi1cyTzr8klwJt3qPpLxlDEsa7RmlbPZNoDLGWY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oNxh5/eebZa4JvmvcIJSJTtDo0lYlCPHLkJ6OkrvXeobQsAbjFGPYJXAIfCgKDuzn/QC2QqM8fjFddamh81L1fyX5DVn3DmsSpGEmwujRUctNGHssmLqbYt3DTCh3BRxg8GLK9r4ak8wwsjQN/PTbZQCTFrxa1aH+y4jOVsMN4w= 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=fOBSdc3N; arc=none smtp.client-ip=209.85.221.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="fOBSdc3N" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-37ccfba5df5so3208719f8f.0; Mon, 07 Oct 2024 12:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728330607; x=1728935407; 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=2acOvDBhhKlNlrzh8C1bE3Xl0WYWldRt0wAyp0DbI5U=; b=fOBSdc3NyDq9aiqPxb8gk3/0dcsOtKpzvvzNrACswfRikwDsZl9oIVUg16RWuhU5XI P/NV+QRpbrM4FfciBnWuMFqlmjyr2uXYHfE3MdreORm98fQ0I2IP+Rw6xcV80qhGQJ60 1IAHE8/5YxSTkLOX8fb1vrD9ftlDCDhAPwRJGAq6MhuiLSgGWqgzELGKQr0Yw79LwhWC xO209Ei+kWe7nvy8nMUTbVDLD2kM527acsgNFpXGsZcDajvL9mjj+rJJNbYXwWXlk85R 04rNivLrTx562ae0lO6ofHkGlOGvZS7e8InZJU5C4XtVkoxEXTEwrAxE9A9s1eKcRDhf AKCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728330607; x=1728935407; 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=2acOvDBhhKlNlrzh8C1bE3Xl0WYWldRt0wAyp0DbI5U=; b=AN3orCJhUZJUyckC/P5u+8ZDg6/2Z3SWA12AT2Y1MaqHDTFUgrpoE3HKsgjSNQWtYm 2kRTt3dpg+Om2+XyGn3jB3csOjaf1bhIsePXUAoR0NkeYxXR0WGdz6jOYiRc3sU1hyoJ p587GzqgYIl21CIPA4vSRXnTJ7Nd9KvXrnMc1IzhOMDV+EdaV5qU3NdsH1lCBcAYMutA Gwng69YR+NSt+1PkwouMpRPUdUEKGY7xq2MESW/XhD/YbX6Yc1xTaqxGALXgcc4f4x7i 9Ipa4PoS9YpY/Jo09waT7I9dkbOcq4Q6tLTVB1y8Ik9sfBt0YFZNspYNCo2G/7eRy8DV W13A== X-Forwarded-Encrypted: i=1; AJvYcCUh/GeFarH9D6swTO4OH7TvKrfWcjbpvFNAgDI1ntAgg9QVThV9WNME9lXPjDGvEFLVffekbqSv2ytP@vger.kernel.org, AJvYcCVWOT41yL7lmWcXsGJeIJdMzNeMyd7ERskrZrzjXCxl+EDKDPXgkBWPJPwC2ZaRKIf36SZ2nIEvS2y9@vger.kernel.org, AJvYcCXHJdcZ6qlbvntrIZN2Wv00yWqZZEE7IhrJMQ1+Gu/WR36ZXPqHJfKQvnTxqdv45xxHz5x2TIl8uU75X8ho@vger.kernel.org X-Gm-Message-State: AOJu0Yx+VeVif499AvsjF1CFedWZApzaHiR8pfkXPCki0tbqOgRrLQcH Jx+ha3ysizDhW/Va2DRHgza8m3a6bqMUsZFTxe6hPlCl8Mp3mlayIyhGfIgA X-Google-Smtp-Source: AGHT+IGdM2EhsbqRUD0/0cV+Qkozm5OOKo4AQ70YYNlw8wYxBb+B/RyPEkx58sJh0Am5vS7iX83xhw== X-Received: by 2002:a5d:43cc:0:b0:376:37e:2729 with SMTP id ffacd0b85a97d-37d0e7373f6mr8130185f8f.31.1728330607231; Mon, 07 Oct 2024 12:50:07 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:b658:eac0:bb05:9042]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed922esm84939655e9.39.2024.10.07.12.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 12:50: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 Subject: [PATCH v8 3/4] iio: pressure: bmp280: Add data ready trigger support Date: Mon, 7 Oct 2024 21:49:44 +0200 Message-Id: <20241007194945.66192-4-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241007194945.66192-1-vassilisamir@gmail.com> References: <20241007194945.66192-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 9ad29cf4c2ac..5779e1977a7a 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 @@ -1284,6 +1286,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 @@ -1785,6 +1844,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; @@ -1882,6 +2016,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); @@ -2429,6 +2564,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; @@ -2507,6 +2724,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); @@ -3055,8 +3273,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 3babf90ce73c..12f6e90b3728 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 @@ -407,6 +424,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; @@ -509,6 +529,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 Wed Nov 27 22:26:03 2024 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 A9BE41DE4E8; Mon, 7 Oct 2024 19:50:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330613; cv=none; b=dsnRBvYSC+sUe/9gxQ3M55aSjp2y3SZqh8pTjC8QcHrxy6jBfohPhSzb5ArKG4R6GQPf3ey6rueCcrR443nD9ZSX8aZYdpHeQl5kPdpQ70TjoDHiNH6ZWeSF9t84Bym9BzG6fv+2Ebb8VnEMvEGYKSt/i8wXVcAUTx24VQ4DofE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728330613; c=relaxed/simple; bh=tFrcW5d+M/kISjk43174v7igvL9U7AcDJkDm/U23KrA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f5Mg2t++ypEEcGcJzOHhExxfBR+FMVtuuly+1BzbCsLWVbVWmqSeTrH0Rcj+y3KPjlEoIaOReH8RH3P3Eqs16jbrnayswM1GFFeUJIAHB3uB3rrOtiNcCaeu5d/iKw+MEkKLyoc3gkjI/XlPknrs88Ybjx9Np482k8SRBj/Nb6c= 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=GgodtPZm; arc=none smtp.client-ip=209.85.128.47 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="GgodtPZm" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cb9a0c300so44746455e9.0; Mon, 07 Oct 2024 12:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728330610; x=1728935410; 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=CcV5nc6g7ztCaCXsHL5P5H5wDsK3QY9ven0Gcatgh24=; b=GgodtPZmQ+9kbANb1Zr3OuV2yF3l/oHBZT7Ba4KIK2GqjyFuNNxxsoli5xYaCSKva4 h68+jQrTFhLZ+K9vT2bcYNpXMUM0VR3suAfavyxlPHHxNRacqs9dNpoWtgywhSj/s9zc yyrCoXnOwmpEtHqxWC7ZF7JBI+vjkZbNoBue5U7KvA0QflemAgWx61bNuGsYW92QAb8c HIsSJz51QVmV9lclvmshF+azq0/4MzxSuui/wQRoY7Z++oUYJ1iQhF2IAcSoK/FTJCoS 8s+GDf9NQI6ok5vZgS+4HyKZmQmRJhw9mWPkTjshWI6W0/W2UE7HvpeRVwRRHVjl+wyt pZdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728330610; x=1728935410; 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=CcV5nc6g7ztCaCXsHL5P5H5wDsK3QY9ven0Gcatgh24=; b=xL/ophGqL8QSV9gH2G+wIs8+FyN0QKQkd8f+Zjv0rBPhf37/qD0VjvPTGk2pNCHtgi cJal8JQ0T8ov2sWzAjSYFAIx2eHsiv/FuGyH4sjrJZSqvj/xr8DARZyfTWbzRpK7llUR IP8T/t/5k4udcxXmIEBiIKt/SUW9TG91TO8LwpzMVtYYgQBEZvOfaf7aaJJfOyE8X4hK 756UGcIycpc+COyC5nmodXQucaMQPEt1UyPw9HefwVNhJp2ILHUgetQNWQQxhqzq9E1L 3LnNa0WHfGBgxxx5FYIO51obFPpYBsLAxEotCPlKMOi3UBvGPW/y3MEqTe4lOtkY/t2J ho0Q== X-Forwarded-Encrypted: i=1; AJvYcCWe2f3ixxUBFUPpph/d4bFoNOz+eGQBcEIN8hVOB+tccjlZ13I551IoXrcB80pL3KkJUxgV5InZGEhS@vger.kernel.org, AJvYcCX5V3bLT001AKK8Nl15/Pzw7kY1gEqwZPkBf+bh7Lou2Yo3Odzc+Qa7UvofiRrxxtycq7Q48ukZ6c5aBuav@vger.kernel.org, AJvYcCXJJsVyyMKHVabWSMXdnRCLLZFfhXYMx632nlRArFY4+5ypHzrz40HPnMxqDrU4sQpzd19Og3iQQ9/a@vger.kernel.org X-Gm-Message-State: AOJu0YwBTMf9ZLnrDEZS10N8/xn5IBm/dbO5s5bBUQu0Qev4oCFVbHpN buoMND25XnjNnra4/9cU6rZ3z1Z8gdfyIxCNkinheKEnENNCsgMx X-Google-Smtp-Source: AGHT+IF8YOahGsBOIEgvzA6NcPaGblkbMEYW+U8h/tSg6gqbzFGf+1LYGrlTNeLMDB5iX5YwVQmI2Q== X-Received: by 2002:a05:600c:190b:b0:42c:be90:fa2f with SMTP id 5b1f17b1804b1-42f85af4582mr96309255e9.25.1728330609833; Mon, 07 Oct 2024 12:50:09 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:b658:eac0:bb05:9042]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed922esm84939655e9.39.2024.10.07.12.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 12:50: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 v8 4/4] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Date: Mon, 7 Oct 2024 21:49:45 +0200 Message-Id: <20241007194945.66192-5-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241007194945.66192-1-vassilisamir@gmail.com> References: <20241007194945.66192-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 5779e1977a7a..da7ae7e3164c 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -3070,13 +3070,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) { @@ -3086,13 +3089,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"); @@ -3100,9 +3098,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); @@ -3274,8 +3311,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 12f6e90b3728..2df1175b6b85 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -534,6 +534,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