From patchwork Thu Jul 25 23:10:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742195 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.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 437D913A40F; Thu, 25 Jul 2024 23:10:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949049; cv=none; b=j3McKzEj9+zrOrOFW10DfuIwQPlui6baxvLDQlXaNHeL3kIKip8dcNzYCAPIsi/v47iNoUqxkNFkEaCuIob7I5zeh5n8JnFmJI/uTWeu9Y8zX3fJe1HgLPZ+kkMi9kPHi47yg/KLNNTs7SEYyc0MY6/x/5G7xyzGDS/1LMU+aM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949049; c=relaxed/simple; bh=bU6g/1CewHrh3Y4eSpL2nkX2mIMfO2GJeDtVaICiEjE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lfviO0Lj1NA01C88XfKtsgA8YFP3gX9D4/MkFkQ6qHFpoNzPrgNMBLH8Elh1wYdGVBgYE7fKMDViXXquLq1KCMOwQs5Nx3tn/kPPmZuQMYQ9HZ29gU56RTq18oKWv2hyPknAMU+U2YxJdgI+Sc0+03hdWmUor/tUQJUKe9TfbjE= 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=TfWLyBEo; arc=none smtp.client-ip=209.85.221.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="TfWLyBEo" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3687ea0521cso983676f8f.1; Thu, 25 Jul 2024 16:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949046; x=1722553846; 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=9Pk3VNmmXeFSyUl6MZ453RlDn1WfDN/cfyqG4a/8dck=; b=TfWLyBEob+XarDnsI575FCrlbjpsk0xYLpq66bWfTcpJ6gL1eADjVdDORb8qYUxQf4 VIBLs53iREhckMRJVchlSiJ/vxlLrkialZCXnAaZYfR7jGTtVqAZqAh548SuVZUz/ii7 f2nBTLUyQHxs34l9Ao0qfc54PLl3/1iT+spr6KbpyqSj9foqsGTLu2PpFau/mV670gxm xgRRd0LaU/NHJJiCK2GtI593zbaVCwg1aUXIMVdmK6v6nG37mZEMorIGYCTCqKaP7AIv cL6oFEgUUP6ZwfKTbrLvl5bsRYo8dpNOU50DWtEwojQG5te9F/rYe/L3/SxZue5uwyUl C/kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949046; x=1722553846; 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=9Pk3VNmmXeFSyUl6MZ453RlDn1WfDN/cfyqG4a/8dck=; b=d3QS0KpaHWqop5dDMuVU64uJF6h8DZbQd4dd1sJ5nNAp1tEYvhq1RGxq+J3pcwkElS mbjghGJsovZ1vyI5S5v6P3Hlg9B+YJDBOHdDOyX2ft/y7W4sQLx6GZEzbiWF0gwquNfh AtCh2lQIb5bgP4VHKEBrKKlTqNvmMcxrzUOW3gZ90yaI5pHv9eVpUY5Mvs+IgVgslH3a E6r9EEjvMOLPQQ4Ezy7CaG6N7X850f6hPZ6KG+QvLNJzxMSszt+lP67iw21VLTcpzQW4 g6R+kX7VfvWJQSY4rufApgQAIRO41AouT6Pq91GW7ISbdpZ1m9SnlNpA6KHIouVO9U5o wGhg== X-Forwarded-Encrypted: i=1; AJvYcCXtr0nX06u1HXve0spOFZ43xS4xX49Wd3u9wNSUlcAWSMqrfl8INlEK1QOsWaJdqx7Y/gFup/8HRWENzyrM6Lcf9SfSnAYJJuWn4lY3XOzx4PNIPP7lJ56mjnNysTkNxBzKlxFz0w9QrsxE/b0IbNzyj+mjRMmrbBJ253QxHiwRxOb4TA== X-Gm-Message-State: AOJu0YywBirbisk1ZafHRu9DV9vXTupS3iq7aqjTjI7j/UzM0TEIc+ms 2276sHhDXeYicO+iLACy/6uhxWzi/n+f2wMyYjvaaZGk2y+jeyj2HNEKYBaN500= X-Google-Smtp-Source: AGHT+IFtGti7GttichkeNh5KbVtrBZYQrb4xY2QAIVOzFkS1RisYA1umVyrFy21fVhJdgpi2fWDDoQ== X-Received: by 2002:a5d:648c:0:b0:368:6f64:307c with SMTP id ffacd0b85a97d-36b363c46dfmr3476283f8f.15.1721949046261; Thu, 25 Jul 2024 16:10:46 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10: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 Subject: [PATCH v2 1/7] iio: pressure: bmp280: Use bulk read for humidity calibration data Date: Fri, 26 Jul 2024 01:10:33 +0200 Message-Id: <20240725231039.614536-2-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert individual reads to a bulk read for the humidity calibration data. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 62 ++++++++++-------------------- drivers/iio/pressure/bmp280.h | 6 +++ 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 3deaa57bb3f5..d5e5eb22667a 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -118,6 +118,12 @@ enum bmp580_odr { */ enum { T1, T2, T3, P1, P2, P3, P4, P5, P6, P7, P8, P9 }; +/* + * These enums are used for indexing into the array of humidity parameters + * for BME280. + */ +enum { H2 = 0, H3 = 2, H4 = 3, H5 = 4, H6 = 6 }; + enum { /* Temperature calib indexes */ BMP380_T1 = 0, @@ -344,6 +350,7 @@ static int bme280_read_calib(struct bmp280_data *data) { struct bmp280_calib *calib = &data->calib.bmp280; struct device *dev = data->dev; + s16 h4_upper, h4_lower; unsigned int tmp; int ret; @@ -352,14 +359,6 @@ static int bme280_read_calib(struct bmp280_data *data) if (ret) return ret; - /* - * Read humidity calibration values. - * Due to some odd register addressing we cannot just - * do a big bulk read. Instead, we have to read each Hx - * value separately and sometimes do some bit shifting... - * Humidity data is only available on BME280. - */ - ret = regmap_read(data->regmap, BME280_REG_COMP_H1, &tmp); if (ret) { dev_err(dev, "failed to read H1 comp value\n"); @@ -368,43 +367,24 @@ static int bme280_read_calib(struct bmp280_data *data) calib->H1 = tmp; ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H2, - &data->le16, sizeof(data->le16)); - if (ret) { - dev_err(dev, "failed to read H2 comp value\n"); - return ret; - } - calib->H2 = sign_extend32(le16_to_cpu(data->le16), 15); - - ret = regmap_read(data->regmap, BME280_REG_COMP_H3, &tmp); - if (ret) { - dev_err(dev, "failed to read H3 comp value\n"); - return ret; - } - calib->H3 = tmp; - - ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H4, - &data->be16, sizeof(data->be16)); + data->bme280_humid_cal_buf, + sizeof(data->bme280_humid_cal_buf)); if (ret) { - dev_err(dev, "failed to read H4 comp value\n"); + dev_err(dev, "failed to read humidity calibration values\n"); return ret; } - calib->H4 = sign_extend32(((be16_to_cpu(data->be16) >> 4) & 0xff0) | - (be16_to_cpu(data->be16) & 0xf), 11); - ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H5, - &data->le16, sizeof(data->le16)); - if (ret) { - dev_err(dev, "failed to read H5 comp value\n"); - return ret; - } - calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11); - - ret = regmap_read(data->regmap, BME280_REG_COMP_H6, &tmp); - if (ret) { - dev_err(dev, "failed to read H6 comp value\n"); - return ret; - } - calib->H6 = sign_extend32(tmp, 7); + calib->H2 = get_unaligned_le16(&data->bme280_humid_cal_buf[H2]); + calib->H3 = data->bme280_humid_cal_buf[H3]; + h4_upper = FIELD_GET(BME280_COMP_H4_GET_MASK_UP, + get_unaligned_be16(&data->bme280_humid_cal_buf[H4])); + h4_upper = FIELD_PREP(BME280_COMP_H4_PREP_MASK_UP, h4_upper); + h4_lower = FIELD_GET(BME280_COMP_H4_MASK_LOW, + get_unaligned_be16(&data->bme280_humid_cal_buf[H4])); + calib->H4 = sign_extend32(h4_upper | h4_lower, 11); + calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, + get_unaligned_le16(&data->bme280_humid_cal_buf[H5])), 11); + calib->H6 = data->bme280_humid_cal_buf[H6]; return 0; } diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index ccacc67c1473..9bea0b84d2f4 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -257,8 +257,13 @@ #define BME280_REG_COMP_H5 0xE5 #define BME280_REG_COMP_H6 0xE7 +#define BME280_COMP_H4_GET_MASK_UP GENMASK(15, 8) +#define BME280_COMP_H4_PREP_MASK_UP GENMASK(11, 4) +#define BME280_COMP_H4_MASK_LOW GENMASK(3, 0) #define BME280_COMP_H5_MASK GENMASK(15, 4) +#define BME280_CONTIGUOUS_CALIB_REGS 7 + #define BME280_OSRS_HUMIDITY_MASK GENMASK(2, 0) #define BME280_OSRS_HUMIDITY_SKIP 0 #define BME280_OSRS_HUMIDITY_1X 1 @@ -423,6 +428,7 @@ struct bmp280_data { /* Calibration data buffers */ __le16 bmp280_cal_buf[BMP280_CONTIGUOUS_CALIB_REGS / 2]; __be16 bmp180_cal_buf[BMP180_REG_CALIB_COUNT / 2]; + u8 bme280_humid_cal_buf[BME280_CONTIGUOUS_CALIB_REGS]; u8 bmp380_cal_buf[BMP380_CALIB_REG_COUNT]; /* Miscellaneous, endianness-aware data buffers */ __le16 le16; From patchwork Thu Jul 25 23:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742196 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 B70E11494C4; Thu, 25 Jul 2024 23:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949051; cv=none; b=kQE80rWe26VY3RI8DFf8og2U68fcJro631Ta7n+tHOGkymE3LZFAInh27vIR6LRk70Sjbw4TVg5PoiUVEuTcDTukYLObAiVx6le07w64bVt7X+oTZiUyIYWwE8JkIIVRKr3zr3eR23yjaPVYTI0yYBJV3+Ohd5YBO7ZCRUc6Qi8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949051; c=relaxed/simple; bh=ksdn5wB+tta7x/8oVgg9wypSwwNZ9K6lCaVpblbLZs0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cwAQyIIfYzWpXrPRJ7CQJ0ImP1KnadPhPpV8i48cMZATBlLoQp93gs0fSAjPBT1ci2ij1lGuLQYWjoWQXpM63Iy4W49uwbuDA0YzVuWjk0LwYboJw5Vj+PNRI5Sz7WTHGPL6+RqGLipnPL4RhI3GifAySytnuZY0pntKIZASeJ8= 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=aA+wDTPD; arc=none smtp.client-ip=209.85.218.52 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="aA+wDTPD" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a7aada2358fso185350166b.0; Thu, 25 Jul 2024 16:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949048; x=1722553848; 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=c1oyEP+an+rM2gjFALCv/EpHEYlPmPknAR8aXXGP/Y0=; b=aA+wDTPDAjogAXtxxF26qL3mIV3FdWEahBBatopSrd5fLVPmbCnnTV+G/pMX2wgHpu cImXHi/QTu74dp+gE8ntkCrqbIKl+HL7W7bO+sOjv1niYxUJE+otl8zX27i8hCm2fHTe +ZtmaqUhxdnU4ld2sSFNUo/iSzaOyVzwiRtEhjisV+L5X3Q3BEwcg1lrpUYLhdSeugky XPyxna+yBMU4pzD3oILDdmRDhLG84wBdBnmaDy/3Nv9sQO0AjtwrVAgxYH+uKVwGyZ9e E5oZn43K/7beOA77JPpYxJ9l0w3tMn3AVHLt3bmm3Z0txKFgCC1y8UJn9ngRukhS09Xq MuBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949048; x=1722553848; 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=c1oyEP+an+rM2gjFALCv/EpHEYlPmPknAR8aXXGP/Y0=; b=l7m20OwvHukxtnmGEZV/EgtFnX0ddQQhydWYGIs66ySuuQM0QzuFsWAXYMbq0GZTTf iEVMdLb9L7SBEcwEVPvwcP+3ik4nH1LQP5PcDop41HcaXyVvWQMfSnwdBYR+nYSw1lsK 9C4RiGm8tFWkwEjbogFSW8Wz3GPPFI8mMCX0NXmQ7eBh+p12b49tfEjiuf9JDce1H5hU IL9BRHXyRfepUFj07QvTrfGlvsU5pp1xLID11s1yqusD57MxF3ft/NH5plhhv/kpax71 F2H+NXcMudDjVIZVPRgvubKeYFl1D80HHoFXoQbhxJCFOylHwh6wyI9o9RgPFIQkisTQ E6CQ== X-Forwarded-Encrypted: i=1; AJvYcCXnmD1k5PVEulQABjWERowJxrw+/xJkOvX8EDBcxAZX8tcBbWohnjCb4VmEMu0+VIwWTIfNWrUoTil0lWgii2NUEeDxLl+QQV4qjrbkHNKLo3hpO2QpqjHwNRWLANoXdyVtfV5+efmN9MCSVqRZnezkfuJyifYWOax5tWj2Blv0yd8v7A== X-Gm-Message-State: AOJu0Yw2R8TYiyiX8J8IXeBL8K1W39TPkcikFUpDH15B6OgtX2YnvAQS hJ1O2QjFSoK9WWb0vuB5ZXgOpaXhLcMwhfADlPL3ltGHqelap+7p X-Google-Smtp-Source: AGHT+IF3ExE82pbTxPu5JshPyHrsv0Qoi+brVSypnQOZVZ7IJWFwLg8VOtfhbdzAKktNy/vb39daYg== X-Received: by 2002:a17:907:7209:b0:a7a:a2e3:3739 with SMTP id a640c23a62f3a-a7ab2ed1448mr726184766b.20.1721949047729; Thu, 25 Jul 2024 16:10:47 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10: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 Subject: [PATCH v2 2/7] iio: pressure: bmp280: Add support for bmp280 soft reset Date: Fri, 26 Jul 2024 01:10:34 +0200 Message-Id: <20240725231039.614536-3-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The BM(P/E)28x devices have an option for soft reset which is also recommended by the Bosch Sensortech BME2 Sensor API to be used before the initial configuration of the device. Link: https://github.com/boschsensortec/BME280_SensorAPI/blob/bme280_v3.5.1/bme280.c#L429 Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 28 ++++++++++++++++++++++++++++ drivers/iio/pressure/bmp280.h | 3 +++ 2 files changed, 31 insertions(+) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index d5e5eb22667a..acbc33aacc09 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -963,6 +963,32 @@ static const unsigned long bme280_avail_scan_masks[] = { 0 }; +static int bmp280_preinit(struct bmp280_data *data) +{ + unsigned int reg; + int ret; + + ret = regmap_write(data->regmap, BMP280_REG_RESET, BMP280_RST_SOFT_CMD); + if (ret) { + dev_err(data->dev, "Failed to reset device.\n"); + return ret; + } + + usleep_range(data->start_up_time, data->start_up_time + 500); + + ret = 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_IM_UPDATE) { + dev_err(data->dev, "Failed to copy NVM contents.\n"); + return ret; + } + + return 0; +} + static int bmp280_chip_config(struct bmp280_data *data) { u8 osrs = FIELD_PREP(BMP280_OSRS_TEMP_MASK, data->oversampling_temp + 1) | @@ -1079,6 +1105,7 @@ const struct bmp280_chip_info bmp280_chip_info = { .read_temp = bmp280_read_temp, .read_press = bmp280_read_press, .read_calib = bmp280_read_calib, + .preinit = bmp280_preinit, .trigger_handler = bmp280_trigger_handler, }; @@ -1196,6 +1223,7 @@ const struct bmp280_chip_info bme280_chip_info = { .read_press = bmp280_read_press, .read_humid = bme280_read_humid, .read_calib = bme280_read_calib, + .preinit = bmp280_preinit, .trigger_handler = bme280_trigger_handler, }; diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index 9bea0b84d2f4..a9f220c1f77a 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -205,6 +205,9 @@ #define BMP280_REG_CONFIG 0xF5 #define BMP280_REG_CTRL_MEAS 0xF4 #define BMP280_REG_STATUS 0xF3 +#define BMP280_REG_STATUS_IM_UPDATE BIT(0) +#define BMP280_REG_RESET 0xE0 +#define BMP280_RST_SOFT_CMD 0xB6 #define BMP280_REG_COMP_TEMP_START 0x88 #define BMP280_COMP_TEMP_REG_COUNT 6 From patchwork Thu Jul 25 23:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742197 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 0C787149C76; Thu, 25 Jul 2024 23:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949052; cv=none; b=Y96EGsHQZZTyW+cLpdqgCaZagl+M1NxbDCecZFBmWHLEUIVff1JkxxsrBaD/YR3TUSKqnYqSIjvsdUmbAlAX7E0tiXPiiOO4xRW8FHkOdYGfNhmNXSOw+R4IiSOc9eLufMOZITKoC7vatKCbXBla6a64bWbatJwnDJ7ZnPvSWBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949052; c=relaxed/simple; bh=rJAiuV9xx9FMZGrsIzqR6PXw570zKjEmwwuD7DwG4j8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ekXusQzb+j0w3AB5QJGa/qP7jyzKcmQzS2dSq4hy7oLdLimkLOK3iXpITGhbdflyVTOiD+XRZZPs3xOMXp7sIddVPfBm19ucFcNtteE1kYTQEow4sKanbrlkvql2XzJKf0zVJwemBtq7FrTVKInXC0giWzWrhrudQsoskxYkqG4= 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=GDBUr8jp; arc=none smtp.client-ip=209.85.128.52 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="GDBUr8jp" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4266dc7591fso10563875e9.0; Thu, 25 Jul 2024 16:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949049; x=1722553849; 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=3Ha6q96XujnRfh9y64ZqiYgBLoCWejUjagA6iayTCJI=; b=GDBUr8jp5mPI4pZiucXsk/8V+9H0/17EIO/pSuz1x50IJ71WoqXo3lAOtFtiYcUwKi ap+/cGXaStKF8Y7KEjbRUmiiMErcqgVmo7jt21pxB3/3z/uA0FIb0bvQF4MDAqkizo1h BFllzh2Jpib/k0Mqf0V0dC3e4DWkMPQQdyqOyOGM8hAVJbNrm/Eb2YQslk9z8IETXjLz xcDStsKL8gi2qIIqGxf3GlpGqjzJrtPlqp8A+gXjHB+fSjHGRvZ/vEyTG5osXaS4YIK2 DqOpbgkhqwSdamgDd6gMnYB/g52oIC0VAFoegieAE9LwvsP2H3tlCLCGvP/zHO6nk/J8 /UdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949049; x=1722553849; 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=3Ha6q96XujnRfh9y64ZqiYgBLoCWejUjagA6iayTCJI=; b=t7g43Ff+woSGpy6MeDfsNqVI3u8nGhy+Z95bVhvyqLiMNfgW+dvlnUz+3sOPw0C7+S neN1gDs1YnNSbVaR1RD3SuYKHNPvFg+kuEgDgu2AIFYNf6zaBhVEBXHVtoXEVKzLh+n7 2YoPEwCb0ZlC6uDzRjuA3tuqrNNDVYWgp4aHo883kROf03zxS95u+aofGsMg4x3YJ9i3 G/QnM479H8kxovwrFVeAiDbmtiOqgOxT/Z9Vt+siA+V0j7np1PSEpi9nwLZChr01iMqH BJBgq1H6+rzThwGP6jRrCAUktt2GWY4CpEfyq/K/vbSqh+b8mTowrQpc+eBH0C/FoSTm dmAQ== X-Forwarded-Encrypted: i=1; AJvYcCXQZNdkFBuIs8HoH+h1X/vuIF4bSV99h7kv1l3cuKeCrNJJ7Gw6nuPlgod+DxOVnK0CKqnwvMB1pwBNNPm6XSGYuQPglO/PCNnsKI9z4obO19IFYpMuplJ948a/iqL1DIXqsOE+yQeIwA02FNxYs0YncdYN9j4kHKQa5EEU+e4WWgDOvQ== X-Gm-Message-State: AOJu0YwZNoi0TFV10fX2B7nVnNtJt2FmdOktrPGJO1MQ+5qrOPm6JNAt TBVaNWkMYoL2EgP6f4D5HxFVLdvbpZMuyeInv5YFqnlzjpB49DvO X-Google-Smtp-Source: AGHT+IHDSfPhmfbTnKDzdWE2s3vNyOy722FZtFV8IstpuXIcCd1h7ZDHrXpv0HS8rK8uklIo7GYYSg== X-Received: by 2002:a05:6000:cca:b0:368:37d5:3f2e with SMTP id ffacd0b85a97d-36b36445604mr2175914f8f.32.1721949049084; Thu, 25 Jul 2024 16:10:49 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10:48 -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 Subject: [PATCH v2 3/7] iio: pressure: bmp280: Remove config error check for IIR filter updates Date: Fri, 26 Jul 2024 01:10:35 +0200 Message-Id: <20240725231039.614536-4-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When there is a change in the configuration of the BMP3xx device, several steps take place. These steps include: 1) Update the OSR settings and check if there was an update 2) Update the ODR settings and check if there was an update 3) Update the IIR settings and check if there was an update 4) Check if there was an update with the following procedure: a) Set sensor to SLEEP mode and after to NORMAL mode to trigger a new measurement. b) Wait the maximum amount possible depending on the OSR settings c) Check the configuration error register if there was an error during the configuration of the sensor. This check is necessary, because there could be a case where the OSR is too high for the requested ODR so either the ODR needs to be slower or the OSR needs to be less. This is something that is checked internally by the sensor when it runs in NORMAL mode. In the BMP58x devices the previous steps are done internally by the sensor. The IIR filter settings do not depend on the OSR or ODR settings, and there is no need to run a check in case they change. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index acbc33aacc09..431fbe9f3ee9 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -1553,14 +1553,12 @@ static int bmp380_chip_config(struct bmp280_data *data) change = change || aux; /* Set filter data */ - ret = regmap_update_bits_check(data->regmap, BMP380_REG_CONFIG, BMP380_FILTER_MASK, - FIELD_PREP(BMP380_FILTER_MASK, data->iir_filter_coeff), - &aux); + ret = regmap_update_bits(data->regmap, BMP380_REG_CONFIG, BMP380_FILTER_MASK, + FIELD_PREP(BMP380_FILTER_MASK, data->iir_filter_coeff)); if (ret) { dev_err(data->dev, "failed to write config register\n"); return ret; } - change = change || aux; if (change) { /* @@ -2149,15 +2147,13 @@ static int bmp580_chip_config(struct bmp280_data *data) reg_val = FIELD_PREP(BMP580_DSP_IIR_PRESS_MASK, data->iir_filter_coeff) | FIELD_PREP(BMP580_DSP_IIR_TEMP_MASK, data->iir_filter_coeff); - ret = regmap_update_bits_check(data->regmap, BMP580_REG_DSP_IIR, - BMP580_DSP_IIR_PRESS_MASK | - BMP580_DSP_IIR_TEMP_MASK, - reg_val, &aux); + ret = regmap_update_bits(data->regmap, BMP580_REG_DSP_IIR, + BMP580_DSP_IIR_PRESS_MASK | + BMP580_DSP_IIR_TEMP_MASK, reg_val); if (ret) { dev_err(data->dev, "failed to write config register\n"); return ret; } - change = change || aux; /* Restore sensor to normal operation mode */ ret = regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG, From patchwork Thu Jul 25 23:10:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742198 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13A3714A095; Thu, 25 Jul 2024 23:10:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949055; cv=none; b=gQR2ZpOsaF0vORID1JAlEcP+yibdUDql9bCIu0A4/Fua7A00AOtDQY0J1vvoDbUL/EuO3wAC+J2m6J2zvZdN51hTAtnWbFhQkCON+I+V7j6bYgIEwTdWoYlbyuJ8Lc8lH9kI/IgOHu6u9ZA2W2/hc+VST7B7+wclfenumasMzCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949055; c=relaxed/simple; bh=n4Jr4FHuvIMsUk8qx98x71mrho1Na1gQuxe2PAP+lkw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RSBeG1PCE6ZSaIaPaOOsz2UHFGlLgjBk0A+ffa5mwurXyigXoWrvtQuN3WjGShhjmW7IFDQUcz512dfYT+OGjv639bMHC/6fbkR/eXPOXmBwOQgHeddEdA4fLD9qpAIcCJXMl+trSau8sjqgwpvTbQw0cR5RS05HNyYIM+M+vV4= 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=m2tj4Aul; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m2tj4Aul" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a7b2dbd81e3so140193666b.1; Thu, 25 Jul 2024 16:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949051; x=1722553851; 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=HBRTrSWzfMQi2JmatTs2LqqJlIc6oMTOOaK75DRYfgQ=; b=m2tj4AulCfmKEOgeDNxVc5w+1KvXg0kF2XD/NmsE9Lu6wyCM5TY8WVGhUlMu/YVFmS TEXUC7yPNx22kten3qF7nuRXXC/rwkXLlaRtX1N43sxKDlUWNAJTcT8/6OT7OkL3piIK AhTB+1zke8eIaPGUMRr4WOKOWOuUmWR/ieBbl3Fx+7+UBwG+vThLcR3IdJW8Bp4nGF5s /bFE/Nc/L9qENJEgHecTz0SjAZ6DwEpfYqGyX2vX1fhhaiqB8PGqbBjseFFQHWdC5G+4 vb2lvw00XipdUhi5roir1WiCz0M+KSEP6woBcTHC64Sdz8MPBtUTItDbDJCyOjCCD5P8 R4Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949051; x=1722553851; 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=HBRTrSWzfMQi2JmatTs2LqqJlIc6oMTOOaK75DRYfgQ=; b=hikJsedpsuj2Yp7KQqPPhDXuNOmvgeq2nDxA/yuRNDWv0YrGmD1imzLARgHKgOt9MI l+mi7QruEBCzxgxFe17nbkzqLXbYEVt01SNip4RDuRo1uK9aoC8P1mez0ONxHvsG5WZj Am1FYGQ1fZb2/fAurp4/yd97d68INzfz6eb2jQE00xjf178+OEmR35rKD+SLgs2g/FSW XPfHo4zB8nsk3uy4xJ33KMsnn9XApXPWAHRwWvfG07gK6VJBoiRhGyareaeYCObCsxk4 E/EjctenF/SD/66DmfamALFpZbiZVsqYcE2uzsjNY/zjkO1UdGtSn4MQ44BiQTUSRVwv 3r8g== X-Forwarded-Encrypted: i=1; AJvYcCW+Spa6duW/suoezV+rLqDxs2kAmygar1FtgMH3nvXaMy0YBNuKZ8ImjDsqwiLkTS8fvwtLYsvbP9R0J49EQBpgniTAZkn8+tp3If6kcwBl9OZHMzJkYQYbpNjD8zKGFf0iORpL3XTwRXpLi+GLehjT5EVAKCOKIypN23O5FXp0sfKsrg== X-Gm-Message-State: AOJu0YxySRJ3f2WfLjAfIo0PaRddYcOXLeCXjqGrTFwsKWho8AnkypAh eD1B3cQLNEAKi4RmxOnz29xDXzCQKblUDceAXhxlDblp4QHiL4zM X-Google-Smtp-Source: AGHT+IGaIqXUMz2N/lGTrB8JTtq8kIpwXeSPIiAdPHsYA55XQ4Vk4KX+mVxUqOV71SQDiQynF4QCFg== X-Received: by 2002:a17:907:72c5:b0:a6f:6b6a:e8d0 with SMTP id a640c23a62f3a-a7ac4d9d2a1mr304671466b.7.1721949051324; Thu, 25 Jul 2024 16:10:51 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10:50 -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 Subject: [PATCH v2 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Date: Fri, 26 Jul 2024 01:10:36 +0200 Message-Id: <20240725231039.614536-5-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This commit adds 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. This commit, adds sleep and forced mode support. Essentially, the sensor sleeps all the time except for when a measurement is requested. When there is a request for a measurement, the sensor is put into forced mode, starts the measurement and after it is done we read the output and we put it again in sleep mode. For really fast and more deterministic measurements, the triggered buffer interface can be used, since the sensor is still used in normal mode for that use case. This commit does not add though support for DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by the BMP58x version. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 264 ++++++++++++++++++++++++++--- drivers/iio/pressure/bmp280.h | 18 ++ 2 files changed, 263 insertions(+), 19 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 431fbe9f3ee9..4a8d2ed4a9c4 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -615,6 +615,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_PROCESSED: + ret = data->chip_info->set_mode(data, BMP280_FORCED); + if (ret) + return ret; + + ret = data->chip_info->wait_conv(data); + if (ret) + return ret; + switch (chan->type) { case IIO_HUMIDITYRELATIVE: ret = data->chip_info->read_humid(data, &chan_value); @@ -644,6 +652,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev, return -EINVAL; } case IIO_CHAN_INFO_RAW: + ret = data->chip_info->set_mode(data, BMP280_FORCED); + if (ret) + return ret; + + ret = data->chip_info->wait_conv(data); + if (ret) + return ret; + switch (chan->type) { case IIO_HUMIDITYRELATIVE: ret = data->chip_info->read_humid(data, &chan_value); @@ -989,6 +1005,67 @@ static int bmp280_preinit(struct bmp280_data *data) return 0; } +static const u8 bmp280_operation_mode[] = { BMP280_MODE_SLEEP, + BMP280_MODE_FORCED, + BMP280_MODE_NORMAL }; + +static int bmp280_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + case BMP280_FORCED: + case BMP280_NORMAL: + break; + default: + return -EINVAL; + } + + ret = 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; + } + + return 0; +} + +static int bmp280_wait_conv(struct bmp280_data *data) +{ + unsigned int reg; + int ret, meas_time; + + meas_time = BMP280_MEAS_OFFSET; + + /* Check if we are using a BME280 device */ + if (data->oversampling_humid) + meas_time += (1 << data->oversampling_humid) * BMP280_MEAS_DUR + + BMP280_PRESS_HUMID_MEAS_OFFSET; + + /* Pressure measurement time */ + meas_time += (1 << data->oversampling_press) * BMP280_MEAS_DUR + + BMP280_PRESS_HUMID_MEAS_OFFSET; + + /* Temperature measurement time */ + meas_time += (1 << data->oversampling_temp) * BMP280_MEAS_DUR; + + usleep_range(meas_time, meas_time * 12 / 10); + + ret = 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 = FIELD_PREP(BMP280_OSRS_TEMP_MASK, data->oversampling_temp + 1) | @@ -999,7 +1076,7 @@ static int bmp280_chip_config(struct bmp280_data *data) 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; @@ -1105,6 +1182,8 @@ const struct bmp280_chip_info bmp280_chip_info = { .read_temp = bmp280_read_temp, .read_press = bmp280_read_press, .read_calib = bmp280_read_calib, + .set_mode = bmp280_set_mode, + .wait_conv = bmp280_wait_conv, .preinit = bmp280_preinit, .trigger_handler = bmp280_trigger_handler, @@ -1223,6 +1302,8 @@ const struct bmp280_chip_info bme280_chip_info = { .read_press = bmp280_read_press, .read_humid = bme280_read_humid, .read_calib = bme280_read_calib, + .set_mode = bmp280_set_mode, + .wait_conv = bmp280_wait_conv, .preinit = bmp280_preinit, .trigger_handler = bme280_trigger_handler, @@ -1510,6 +1591,68 @@ static int bmp380_preinit(struct bmp280_data *data) return bmp380_cmd(data, BMP380_CMD_SOFT_RESET); } +static const u8 bmp380_operation_mode[] = { BMP380_MODE_SLEEP, + BMP380_MODE_FORCED, + BMP380_MODE_NORMAL }; + +static int bmp380_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + case BMP280_FORCED: + case BMP280_NORMAL: + break; + default: + return -EINVAL; + } + + ret = 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; + } + + return 0; +} + +static int bmp380_wait_conv(struct bmp280_data *data) +{ + unsigned int reg; + int ret, meas_time; + + /* Offset measurement time */ + meas_time = BMP380_MEAS_OFFSET; + + /* Pressure measurement time */ + meas_time += (1 << data->oversampling_press) * BMP380_MEAS_DUR + + BMP380_PRESS_MEAS_OFFSET; + + /* Temperature measurement time */ + meas_time += (1 << data->oversampling_temp) * BMP380_MEAS_DUR + + BMP380_TEMP_MEAS_OFFSET; + + usleep_range(meas_time, meas_time * 12 / 10); + + ret = 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 = false, aux; @@ -1570,17 +1713,15 @@ static int bmp380_chip_config(struct bmp280_data *data) * Resets sensor measurement loop toggling between sleep and * normal operating modes. */ - ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL, - BMP380_MODE_MASK, - FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_SLEEP)); + ret = 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 = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL, - BMP380_MODE_MASK, - FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_NORMAL)); + + usleep_range(data->start_up_time, data->start_up_time + 500); + + ret = bmp380_set_mode(data, BMP280_NORMAL); if (ret) { dev_err(data->dev, "failed to set normal mode\n"); return ret; @@ -1606,6 +1747,17 @@ static int bmp380_chip_config(struct bmp280_data *data) } } + /* Dummy read to empty data registers. */ + ret = bmp380_read_press(data, &tmp); + if (ret) + return ret; + + ret = bmp380_set_mode(data, BMP280_SLEEP); + if (ret) { + dev_err(data->dev, "failed to set sleep mode\n"); + return ret; + } + return 0; } @@ -1698,6 +1850,8 @@ const struct bmp280_chip_info bmp380_chip_info = { .read_temp = bmp380_read_temp, .read_press = bmp380_read_press, .read_calib = bmp380_read_calib, + .set_mode = bmp380_set_mode, + .wait_conv = bmp380_wait_conv, .preinit = bmp380_preinit, .trigger_handler = bmp380_trigger_handler, @@ -2085,6 +2239,64 @@ static int bmp580_preinit(struct bmp280_data *data) return PTR_ERR_OR_ZERO(devm_nvmem_register(config.dev, &config)); } +static const u8 bmp580_operation_mode[] = { BMP580_MODE_SLEEP, + BMP580_MODE_FORCED, + BMP580_MODE_NORMAL }; + +static int bmp580_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + break; + case BMP280_FORCED: + ret = regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG, + BMP580_DSP_IIR_FORCED_FLUSH); + if (ret) { + dev_err(data->dev, + "Could not flush IIR filter constants.\n"); + return ret; + } + break; + case BMP280_NORMAL: + break; + default: + return -EINVAL; + } + + ret = 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(data->dev, "failed to write power control register\n"); + return ret; + } + + return 0; +} + +static int bmp580_wait_conv(struct bmp280_data *data) +{ + /* + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical + * characteristics + */ + const int time_conv_press[] = { 0, 1050, 1785, 3045, 5670, 10920, 21420, + 42420, 84420}; + const int time_conv_temp[] = { 0, 1050, 1105, 1575, 2205, 3465, 6090, + 11340, 21840}; + int meas_time; + + meas_time = 4000 + time_conv_temp[data->oversampling_temp] + + time_conv_press[data->oversampling_press]; + + usleep_range(meas_time, meas_time * 12 / 10); + + return 0; +} + static int bmp580_chip_config(struct bmp280_data *data) { bool change = false, aux; @@ -2155,17 +2367,6 @@ static int bmp580_chip_config(struct bmp280_data *data) return ret; } - /* Restore sensor to normal operation mode */ - ret = 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 @@ -2261,6 +2462,8 @@ const struct bmp280_chip_info bmp580_chip_info = { .chip_config = bmp580_chip_config, .read_temp = bmp580_read_temp, .read_press = bmp580_read_press, + .set_mode = bmp580_set_mode, + .wait_conv = bmp580_wait_conv, .preinit = bmp580_preinit, .trigger_handler = bmp580_trigger_handler, @@ -2508,6 +2711,19 @@ static int bmp180_read_press(struct bmp280_data *data, u32 *comp_press) return 0; } +/* Keep compatibility with future generations of the sensor */ +static int bmp180_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode) +{ + return 0; +} + +/* Keep compatibility with future generations of the sensor */ +static int bmp180_wait_conv(struct bmp280_data *data) +{ + return 0; +} + +/* Keep compatibility with future generations of the sensor */ static int bmp180_chip_config(struct bmp280_data *data) { return 0; @@ -2578,6 +2794,8 @@ const struct bmp280_chip_info bmp180_chip_info = { .read_temp = bmp180_read_temp, .read_press = bmp180_read_press, .read_calib = bmp180_read_calib, + .set_mode = bmp180_set_mode, + .wait_conv = bmp180_wait_conv, .trigger_handler = bmp180_trigger_handler, }; @@ -2630,6 +2848,7 @@ static int bmp280_buffer_preenable(struct iio_dev *indio_dev) struct bmp280_data *data = iio_priv(indio_dev); pm_runtime_get_sync(data->dev); + data->chip_info->set_mode(data, BMP280_NORMAL); return 0; } @@ -2800,6 +3019,10 @@ int bmp280_common_probe(struct device *dev, return ret; } + ret = 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); @@ -2825,6 +3048,9 @@ static int bmp280_runtime_suspend(struct device *dev) struct iio_dev *indio_dev = dev_get_drvdata(dev); struct bmp280_data *data = iio_priv(indio_dev); + data->chip_info->set_mode(data, BMP280_SLEEP); + + usleep_range(2500, 3000); return regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies); } diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index a9f220c1f77a..f5d192509d61 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 +#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 @@ -246,6 +252,10 @@ #define BMP280_MODE_FORCED 1 #define BMP280_MODE_NORMAL 3 +#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; }; +enum bmp280_op_mode { + BMP280_SLEEP, + BMP280_FORCED, + BMP280_NORMAL, +}; + struct bmp280_data { struct device *dev; struct mutex lock; @@ -485,6 +501,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); irqreturn_t (*trigger_handler)(int irq, void *p); }; From patchwork Thu Jul 25 23:10:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742199 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25230145345; Thu, 25 Jul 2024 23:10:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949055; cv=none; b=f++GxWeHRXGZ6zl+MCUbpOYWQPkoWtgaQmLnJj8NMCVxMT1rnL8KGne1mUL1wE4CIy/6V+l44AjuZa0HBwKuG6gZcfM7vbvtbDeaw4Th219Kslir4NOvBRuUujmVgil66NsFm6fpREPy4Kx6OK8Js5pqRjqo1p1T5s7O2cplf2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949055; c=relaxed/simple; bh=GBHEIWop7OwEU3QgEFVWoe+iCDOsJ6xrle7YPeiWK4s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W6RBG7LaI82km2+qqcTy5MgNgPTmoknLH2GOsjKpW1s6cqutCOLCEdFJ6pj+JvotsP5SkllO/rU1B6pihjNLud3V9RsIGBhI+aNVG9WK3vDy1CxIo0UvVWsBfJtytnVaiWRsgaqnmtuNi/+3oDR0Hvl/R+wGM5hCPlaS57mNdGQ= 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=XgHOnoyl; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XgHOnoyl" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a7aa4ca9d72so135609366b.0; Thu, 25 Jul 2024 16:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949052; x=1722553852; 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=eBjwuvUrhORpfV0arBz8Ep9Xun7kUC/zPhKS7vTgw1Q=; b=XgHOnoyldH6xX1ZNFuvHPtw/lYZvdn+CqR3jQ3Es9Ynvwl4HEL1Vtf40UMQBbHFPFZ 935/Kge+7dpVjWSf2f5ktc3UetneK6XhYm3w1Y2UaTdPdESIcByjrGJrgoWeZNN5znMj KZ0jfvg55M5j3XXWyitYVDZ5BT03Cgfur9aPuxUZD7jRH88l3+MUu4XNMd7uDVLEIv1v VdFyP4vro6CeiGAn0sprcutnzyMh9xh5EJjlm3FBfScp1dA+cxBlqjKs6GuC3T3F4HCH REthoOl+cLMw+XT6lIF8gkLSpcy4pnrxAi08yzfiknYx7vqeOj8q+oQHANYAf3/ZGRWH ltXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949052; x=1722553852; 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=eBjwuvUrhORpfV0arBz8Ep9Xun7kUC/zPhKS7vTgw1Q=; b=CBrohrAq6YdyCrLV3GW8JValzv0sBt10QSMQUdEPFl3lIPLYC7ASOGlnudx4OpL9te AomYjId/jdYmY5QIGC0X/zORs+w8Ohd451K2Nw2VJInJ6z8CVx3JSJQHoAoE76Ll88+9 3CgwgBkaf7AfDyglrWSRzSdPPuU6qN8hfj9BpKt54KXfxXGbtGgwpPR8t0SStY4z9p2B Hpzvtw3FIuLqqiLQHb3C84Jvu4XcxIeCiDoSYhuY8xEuHd446X1Cz+KoGrE/pb1Tagyg aVQlPbkxYAP6oyHCxPEuAqtmv5nAFKYEayAQxMU85mzY8n4eYaJ3uelmJQkk3zMuDuYJ etDg== X-Forwarded-Encrypted: i=1; AJvYcCUVLaMGFe8QgmNBhF//NNArQjIOsbexEFdrJe8xqXm0kt2Jq/PCbD+10Un7jboG5gvLU2TxQJvD4ZNnIHMNOnS5M06biVnBuuMJjV53BDSK9Sosqe3+ywpz/2uOPivVWhkQrEh68cXP6qp3vjbnLyE2N6t6RzelKKyJ0DY+HMOXx5z2rg== X-Gm-Message-State: AOJu0YyUCqb4lknrFE0wbr6QF2aNvuRxmgs0lvMgF+4w16TFBvmcQEzs 41VEh4tWDdJ7drkaZ+LXwqUiu+tTbEcNaVoVLXfS3C2jZoE1lDjG X-Google-Smtp-Source: AGHT+IFoAk3e4khU5If6ITX83DY2rktvfftgilPgiGaGNenB3sxva1pqqoS+W1ugmNSu8h8Qwn5+/Q== X-Received: by 2002:a17:907:96a0:b0:a77:d52c:c42d with SMTP id a640c23a62f3a-a7acb395be2mr264259066b.13.1721949052465; Thu, 25 Jul 2024 16:10:52 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10:52 -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 Subject: [PATCH v2 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Date: Fri, 26 Jul 2024 01:10:37 +0200 Message-Id: <20240725231039.614536-6-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add interrupt options for BMP3xx and BMP5xx devices as well. Signed-off-by: Vasileios Amoiridis --- Documentation/devicetree/bindings/iio/pressure/bmp085.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml index 6fda887ee9d4..072313201edb 100644 --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml @@ -48,9 +48,14 @@ properties: interrupts: description: - interrupt mapping for IRQ (BMP085 only) + interrupt mapping for IRQ. Supported in BMP085, BMP3xx, BMP5xx maxItems: 1 + drive-open-drain: + desription: + set if the interrupt pin should be configured as open drain. + If not set, defaults to push-pull configuration. + required: - compatible - vddd-supply From patchwork Thu Jul 25 23:10:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742200 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2BEB14EC77; Thu, 25 Jul 2024 23:10:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949057; cv=none; b=nSpXZpT5q6dwxeGL0IlLrl99lXT8NcnAtNkus2w2gVjZUQSzUsGpL9bNg0HNCy1jwedRvcQZ+9Qnf2Zv8SixR3ybJIAopIczteYos2fbNzGoz1A6ra/gLLQsmeVZdOEFdW2i/0C083CVHCIeko3QN1jZO48zjJ1T3rrhCygnoaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949057; c=relaxed/simple; bh=MMQV8GSkCu3y39mDMyqIRWWQc62N16URz8VHe31HhQQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f619qDUMuffXZxZML611I2gjIWSTCJEF4J5+i6r/NDgql9eraK3XETSkG76hURvP7uNroxrdXwlH12jdEkk8n6KpbllhXqNFvhLV2hC4N+m+zd1EOFaKgCVi9TgVgCcwafP3sq6WpXFSZFb2NL+erCoP9QnBdApZUyZCYrcpR0o= 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=Jt2AuKlT; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jt2AuKlT" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52efd8807aaso1046258e87.3; Thu, 25 Jul 2024 16:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949054; x=1722553854; 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=NZL6CFksjO07swkGQgmm7spK2mqvVGacGmHjhZjHKvo=; b=Jt2AuKlTFcSen7+MRNOfsMONWgJRwD7BJtOyZZlKobWt3gQMDpgeFMEaoJ5iiTi1ai 5wItfyZ9eq8hXpaIEd90MUrU2m8wua9ttbsAnB/ufpwTHB7QtF4ds2d1A8BWVMiFkk8j ZWZXzumbdRuAg0FOUDfD+xWpcvQ88age7EgEUspW0Td/Mje2JBze4kPERIOO8bd7GP4o FVPTCjUxKKFFUce/5pYvkhW3BQJ/iTjnS79b2FSnCzgniCqYnuq9mEmh2oAxOJ7u6l35 LE9Cao8LL+aGxxMF697//lSMGOGr2FKXL3VeUFYf2GEkNyLtVaTWnnX7GrYGMT1hYuB0 tZ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949054; x=1722553854; 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=NZL6CFksjO07swkGQgmm7spK2mqvVGacGmHjhZjHKvo=; b=lzvj5C7GLrs9rrB0debz8LeuWafV6KYHSCjdqFtqSVz+FhO1jolJ32Q58Lvnrsw6W0 nbOOFYE2FXo1KLrX3sreGPrJXS0ng0qHXE7a0BVVYLwujnU2jYSG5ss2nGQTAVorGyt7 VRYx4KM2QTix0tiQmNSxoeIyB7lCOJRP7swlOhdNvfhUXSBOj0CnwtW8h4nzgd/9vB1o Dc3Wr46RoIsTJc7CHTpaZz5G82M+ecvSih9DbXER8wchYa9s/Ae1DyuucJsw9IXbo3a4 yZpufwTl1z/WkNfF2SSRgYxbQgWE3bSk887QiO0u6xypgN8ZEAGTVb1O/ZS6MqZAo336 raqQ== X-Forwarded-Encrypted: i=1; AJvYcCUtW3WR/6dzh3WyRBmlYGZtQu9ChOk0LeZn3ugvK11oJfoqbLd4I0Xpq7dKbUJaIndVng/msizlIO7ogwUBNhbw5ZIjle4XhhD1mVdFBBMrGvSfH/OpD4O/2pp3ojqJfZ+wkJzw3b3GorP6g92WUAtyRysyrv42O7HNH0i6v6zRDefiYw== X-Gm-Message-State: AOJu0Ywxf1NWtfqFp1owN2/4P7WJM3nmBg97MlttfpaZD//G2cAfyyvH UOWwy8DXZWg/6Si7Yac0dIz+Ma3BlZXbZdB0e5mZu0ZBWFdXbONT X-Google-Smtp-Source: AGHT+IHJ1Gldkr21BklkLNa8tUn78tUdFexIrYrwQg8Oz2ybidiV5jFF/n93CYZLJUNrsaGZCkFVGg== X-Received: by 2002:a05:6512:e95:b0:52f:cce4:51f3 with SMTP id 2adb3069b0e04-52fd3f6b991mr3021337e87.44.1721949053785; Thu, 25 Jul 2024 16:10:53 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10:53 -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 Subject: [PATCH v2 6/7] iio: pressure: bmp280: Add data ready trigger support Date: Fri, 26 Jul 2024 01:10:38 +0200 Message-Id: <20240725231039.614536-7-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- drivers/iio/pressure/bmp280-core.c | 309 ++++++++++++++++++++++++++- drivers/iio/pressure/bmp280-regmap.c | 2 +- drivers/iio/pressure/bmp280.h | 23 +- 3 files changed, 328 insertions(+), 6 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 4a8d2ed4a9c4..4238f37b7805 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -37,12 +37,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -1761,6 +1763,148 @@ static int bmp380_chip_config(struct bmp280_data *data) return 0; } +static void bmp380_trigger_reenable(struct iio_trigger *trig) +{ + struct bmp280_data *data = iio_trigger_get_drvdata(trig); + unsigned int tmp; + int ret; + + ret = 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 = iio_trigger_get_drvdata(trig); + int ret; + + guard(mutex)(&data->lock); + + ret = regmap_update_bits(data->regmap, BMP380_REG_INT_CTRL, + BMP380_INT_CTRL_DRDY_EN, + FIELD_PREP(BMP380_INT_CTRL_DRDY_EN, + state ? 1 : 0)); + if (ret) { + dev_err(data->dev, "Could not enable/disable interrupt\n"); + return ret; + } + + return 0; +} + +static const struct iio_trigger_ops bmp380_trigger_ops = { + .set_trigger_state = &bmp380_data_rdy_trigger_set_state, + .reenable = &bmp380_trigger_reenable, +}; + +static int bmp380_int_config(struct bmp280_data *data) +{ + int ret, int_cfg = FIELD_PREP(BMP380_INT_CTRL_OPEN_DRAIN, + data->trig_open_drain) | + FIELD_PREP(BMP380_INT_CTRL_LEVEL, + data->trig_active_high); + + ret = regmap_update_bits(data->regmap, BMP380_REG_INT_CTRL, + BMP380_INT_CTRL_SETTINGS_MASK, int_cfg); + if (ret) { + dev_err(data->dev, "Could not set interrupt settings\n"); + return ret; + } + + return 0; +} + +static irqreturn_t bmp380_irq_thread_handler(int irq, void *p) +{ + struct iio_dev *indio_dev = p; + struct bmp280_data *data = iio_priv(indio_dev); + unsigned int int_ctrl; + int ret; + + scoped_guard(mutex, &data->lock) { + ret = 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) +{ + struct bmp280_data *data = iio_priv(indio_dev); + struct fwnode_handle *fwnode; + int ret, irq, irq_type; + struct irq_data *desc; + + fwnode = dev_fwnode(data->dev); + if (!fwnode) + return -ENODEV; + + irq = fwnode_irq_get(fwnode, 0); + if (!irq) { + dev_err(data->dev, "No interrupt found\n"); + return -ENODEV; + } + + desc = irq_get_irq_data(irq); + if (!desc) + return -EINVAL; + + irq_type = irqd_get_trigger_type(desc); + switch (irq_type) { + case IRQF_TRIGGER_RISING: + data->trig_active_high = true; + break; + case IRQF_TRIGGER_FALLING: + data->trig_active_high = false; + break; + default: + dev_err(data->dev, "Invalid interrupt type specified\n"); + return -EINVAL; + } + + data->trig_open_drain = fwnode_property_read_bool(fwnode, + "int-open-drain"); + + ret = bmp380_int_config(data); + if (ret) + return ret; + + data->trig = 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 = &bmp380_trigger_ops; + iio_trigger_set_drvdata(data->trig, data); + + ret = devm_request_threaded_irq(data->dev, irq, NULL, + bmp380_irq_thread_handler, IRQF_ONESHOT, + indio_dev->name, indio_dev); + if (ret) { + dev_err(data->dev, "request irq failed\n"); + return ret; + } + + ret = devm_iio_trigger_register(data->dev, data->trig); + if (ret) { + dev_err(data->dev, "iio trigger register failed\n"); + return ret; + } + + indio_dev->trig = iio_trigger_get(data->trig); + + return 0; +} + + static irqreturn_t bmp380_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; @@ -1854,6 +1998,7 @@ const struct bmp280_chip_info bmp380_chip_info = { .wait_conv = bmp380_wait_conv, .preinit = bmp380_preinit, + .trigger_probe = bmp380_trigger_probe, .trigger_handler = bmp380_trigger_handler, }; EXPORT_SYMBOL_NS(bmp380_chip_info, IIO_BMP280); @@ -2390,6 +2535,154 @@ static int bmp580_chip_config(struct bmp280_data *data) return 0; } +static void bmp580_trigger_reenable(struct iio_trigger *trig) +{ + struct bmp280_data *data = iio_trigger_get_drvdata(trig); + unsigned int tmp; + int ret; + + ret = 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 = iio_trigger_get_drvdata(trig); + int ret; + + guard(mutex)(&data->lock); + + ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG, + BMP580_INT_CONFIG_INT_EN, + FIELD_PREP(BMP580_INT_CONFIG_INT_EN, + state ? 1 : 0)); + if (ret) { + dev_err(data->dev, "Could not enable/disable interrupt\n"); + return ret; + } + + return 0; +} + +static const struct iio_trigger_ops bmp580_trigger_ops = { + .set_trigger_state = &bmp580_data_rdy_trigger_set_state, + .reenable = &bmp580_trigger_reenable, +}; + +static int bmp580_int_config(struct bmp280_data *data) +{ + int ret, int_cfg = FIELD_PREP(BMP580_INT_CONFIG_OPEN_DRAIN, + data->trig_open_drain) | + FIELD_PREP(BMP580_INT_CONFIG_LEVEL, + data->trig_active_high); + + ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG, + BMP580_INT_CONFIG_MASK, int_cfg); + if (ret) { + dev_err(data->dev, "Could not set interrupt settings\n"); + return ret; + } + + ret = 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; + } + + return 0; +} + +static irqreturn_t bmp580_irq_thread_handler(int irq, void *p) +{ + struct iio_dev *indio_dev = p; + struct bmp280_data *data = iio_priv(indio_dev); + unsigned int int_ctrl; + int ret; + + scoped_guard(mutex, &data->lock) { + ret = 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) +{ + struct bmp280_data *data = iio_priv(indio_dev); + struct fwnode_handle *fwnode; + int ret, irq, irq_type; + struct irq_data *desc; + + fwnode = dev_fwnode(data->dev); + if (!fwnode) + return -ENODEV; + + irq = fwnode_irq_get(fwnode, 0); + if (!irq) { + dev_err(data->dev, "No interrupt found\n"); + return -ENODEV; + } + + desc = irq_get_irq_data(irq); + if (!desc) + return -EINVAL; + + irq_type = irqd_get_trigger_type(desc); + switch (irq_type) { + case IRQF_TRIGGER_RISING: + data->trig_active_high = true; + break; + case IRQF_TRIGGER_FALLING: + data->trig_active_high = false; + break; + default: + dev_err(data->dev, "Invalid interrupt type specified\n"); + return -EINVAL; + } + + data->trig_open_drain = fwnode_property_read_bool(fwnode, + "int-open-drain"); + + ret = bmp580_int_config(data); + if (ret) + return ret; + + data->trig = 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 = &bmp580_trigger_ops; + iio_trigger_set_drvdata(data->trig, data); + + ret = devm_request_threaded_irq(data->dev, irq, NULL, + bmp580_irq_thread_handler, IRQF_ONESHOT, + indio_dev->name, indio_dev); + if (ret) { + dev_err(data->dev, "request irq failed\n"); + return ret; + } + + ret = devm_iio_trigger_register(data->dev, data->trig); + if (ret) { + dev_err(data->dev, "iio trigger register failed\n"); + return ret; + } + + indio_dev->trig = iio_trigger_get(data->trig); + + return 0; +} + static irqreturn_t bmp580_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; @@ -2466,6 +2759,7 @@ const struct bmp280_chip_info bmp580_chip_info = { .wait_conv = bmp580_wait_conv, .preinit = bmp580_preinit, + .trigger_probe = bmp580_trigger_probe, .trigger_handler = bmp580_trigger_handler, }; EXPORT_SYMBOL_NS(bmp580_chip_info, IIO_BMP280); @@ -3013,10 +3307,17 @@ 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 == BMP180_CHIP_ID)) { - ret = bmp085_fetch_eoc_irq(dev, name, irq, data); - if (ret) - return ret; + if (irq > 0) { + if (chip_id == BMP180_CHIP_ID) { + ret = bmp085_fetch_eoc_irq(dev, name, irq, data); + if (ret) + return ret; + } + if (data->chip_info->trigger_probe) { + ret = data->chip_info->trigger_probe(indio_dev); + if (ret) + return ret; + } } ret = data->chip_info->set_mode(data, BMP280_SLEEP); diff --git a/drivers/iio/pressure/bmp280-regmap.c b/drivers/iio/pressure/bmp280-regmap.c index d27d68edd906..cccdf8fc6c09 100644 --- a/drivers/iio/pressure/bmp280-regmap.c +++ b/drivers/iio/pressure/bmp280-regmap.c @@ -109,7 +109,7 @@ static bool bmp380_is_writeable_reg(struct device *dev, unsigned int reg) case BMP380_REG_FIFO_WATERMARK_LSB: case BMP380_REG_FIFO_WATERMARK_MSB: case BMP380_REG_POWER_CONTROL: - case BMP380_REG_INT_CONTROL: + case BMP380_REG_INT_CTRL: case BMP380_REG_IF_CONFIG: case BMP380_REG_ODR: case BMP380_REG_OSR: diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index f5d192509d61..754eda367941 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 +#define BMP580_INT_STATUS_DRDY_MASK BIT(0) #define BMP580_INT_STATUS_POR_MASK BIT(4) +#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) @@ -117,7 +126,7 @@ #define BMP380_REG_OSR 0x1C #define BMP380_REG_POWER_CONTROL 0x1B #define BMP380_REG_IF_CONFIG 0x1A -#define BMP380_REG_INT_CONTROL 0x19 +#define BMP380_REG_INT_CTRL 0x19 #define BMP380_REG_INT_STATUS 0x11 #define BMP380_REG_EVENT 0x10 #define BMP380_REG_STATUS 0x03 @@ -175,6 +184,14 @@ #define BMP380_TEMP_MEAS_OFFSET 163 #define BMP380_PRESS_MEAS_OFFSET 392 +#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; @@ -504,6 +524,7 @@ struct bmp280_chip_info { int (*set_mode)(struct bmp280_data *data, enum bmp280_op_mode mode); int (*wait_conv)(struct bmp280_data *data); + int (*trigger_probe)(struct iio_dev *indio_dev); irqreturn_t (*trigger_handler)(int irq, void *p); }; From patchwork Thu Jul 25 23:10:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 13742201 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.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 20EBB148FFA; Thu, 25 Jul 2024 23:10:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949059; cv=none; b=S9D/A1MV8/VpL9l1DSknqNQ+Bqxe2HdBKs09Z9nT7JScjhXQjXtTVQTm1i2CY0mGhAF9bragaWobSmUiR1izw0yD/ec6fBD0WZdPTo+M73pGnyIquCs4YyxGygrhJFyztJvAQcXAs/Z9qcQMCsLK2nUR0EShVKAbmXCZJzADlBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721949059; c=relaxed/simple; bh=9D8KeeWQetlsxoUFL1ugZb8b7TzMgt6wdKDF9O+wkAM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZDrALFspZnipAlHu9GeorJTuwe2cO/T9SARceKeiIwUgJUuryI87RMKTOBJC3Zuhi5Gbu7msw8G/Vgg9bFQSRAu98aEY6EnPBk3ZY6pkPoKvRaL0IppRfA6un1MM6ByXu8hN5OHPI+2iKvzoT89So9p1W39Aojtx+/7WzSnpP98= 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=K2nsvYgo; arc=none smtp.client-ip=209.85.218.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="K2nsvYgo" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a7aac70e30dso127594666b.1; Thu, 25 Jul 2024 16:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721949055; x=1722553855; 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=4yH/r578wFjMh6wCaBg5noMdZdwOXW0ey4GWvjb4wsc=; b=K2nsvYgowqdO+JOo6OODgtdmESZybi67/hQY4CKfl/LNE0S7JCtTfH/vSGN4W+OkoA 13lRouD8YPOlEY/B4P3xFIm1udXZ1s+Tuv/OsPksj65xyin+uGNfQOoVz90P67GtshCB 7WuE8Hfy7nxiLUj7+zU21na/V49yi3L240oE922mKSDTCB/f9LFk+pAvcvB5YMPs0ljR 7GjaQcKKw3FSntjFDj2pqITleK704ik8aZahugPORUkecBR+omGn0wB+VV7nil5I9Jzy xTt6pB8RldF5GdM2x5RfGkhjg65ypGxQwBPz5qe5GoPesiNgLPbzfsx1R8d2w/8wQJ0l mjSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721949055; x=1722553855; 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=4yH/r578wFjMh6wCaBg5noMdZdwOXW0ey4GWvjb4wsc=; b=Wzjcq/XH1fkLgA1iOxA+L+1yRCHGN3hYVlIuDBMguk9HCvTulWsrVdWK4k+qvOL0f9 JQyJOtjucs9G8quSpLbCQqsVk7Nvgm7Vee3jl98ggeKJEC3VM+RbR+9WYA/Od2weXf7/ tHnQr5UlDvVN3Dh2WtLeIIzcesW5aBZyAtgDS/NRCbwgLEQJHDD0XfoUu2WICYD3UQm5 /zi+XizHcdYojytlfrNAQQKV2Ce7LeXRSeDedcuMtjEiWptaoO1k9n1CStcL4Evg7O6t Ye2G4yW/+CBDZVQDPLZeoY3vZVhcKdSSYtrQgKHClEOS18RLgVXLqaqbTok1S+v7cA3z r1GA== X-Forwarded-Encrypted: i=1; AJvYcCVUNmHlnQiKeOndw3YH42LfoHyNtFC52RxWeaY1ldt+/r6bW6pAmLS+1YLK6ueQ4ShnbgdhJCHeciJzRbEE57fXHrffI2e/KBjs8d2tuvCTXniKtqxf4GWcwYA0IBWG57K5s2k81HVZRv8UhGOT1zIvRcxGsRor1mEOFuslbF9Wwgpq8w== X-Gm-Message-State: AOJu0YwZg1rHt4webLxLoMlBTffsd3vMI0mpjY2ZvbQjUH7lNGaedAO0 gNvBePFXWX8rtql36TxlBYhwLApEP5pxXoIChRTybLlaO3spfksL X-Google-Smtp-Source: AGHT+IFo2q1MpsO2ErSRtpEkRaKVPUk7wMMO2zAHnU7nDDgYe9DCk22CUlIb5k4Jh/lwhTLoC++d+w== X-Received: by 2002:a17:907:948f:b0:a77:cf9d:f495 with SMTP id a640c23a62f3a-a7acb4a223bmr286639466b.40.1721949055314; Thu, 25 Jul 2024 16:10:55 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:4b59:cba2:6db8:9f30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acab236e3sm115429266b.25.2024.07.25.16.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 16:10:54 -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 Subject: [PATCH v2 7/7] iio: pressure bmp280: Move bmp085 interrupt to new configuration Date: Fri, 26 Jul 2024 01:10:39 +0200 Message-Id: <20240725231039.614536-8-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725231039.614536-1-vassilisamir@gmail.com> References: <20240725231039.614536-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This commit intends to add the old BMP085 sensor to the new IRQ interface of the sensor 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. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 72 +++++++++++++++++++++++------- drivers/iio/pressure/bmp280-i2c.c | 4 +- drivers/iio/pressure/bmp280-spi.c | 4 +- drivers/iio/pressure/bmp280.h | 1 + 4 files changed, 60 insertions(+), 21 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 4238f37b7805..e4d017358b68 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -3104,13 +3104,19 @@ static irqreturn_t bmp085_eoc_irq(int irq, void *d) return IRQ_HANDLED; } -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 = iio_priv(indio_dev); + struct device *dev = data->dev; + struct fwnode_handle *fwnode; unsigned long irq_trig; - int ret; + int ret, irq; + + fwnode = dev_fwnode(data->dev); + if (!fwnode) + return -ENODEV; + + irq = fwnode_irq_get(fwnode, 0); irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq)); if (irq_trig != IRQF_TRIGGER_RISING) { @@ -3120,13 +3126,12 @@ static int bmp085_fetch_eoc_irq(struct device *dev, init_completion(&data->done); - ret = devm_request_threaded_irq(dev, - irq, - bmp085_eoc_irq, - NULL, - irq_trig, - name, - data); + ret = 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"); @@ -3137,6 +3142,44 @@ static int bmp085_fetch_eoc_irq(struct device *dev, return 0; } +const struct bmp280_chip_info bmp085_chip_info = { + .id_reg = bmp180_chip_info.id_reg, + .chip_id = bmp180_chip_info.chip_id, + .num_chip_id = bmp180_chip_info.num_chip_id, + .regmap_config = bmp180_chip_info.regmap_config, + .start_up_time = bmp180_chip_info.start_up_time, + .channels = bmp180_chip_info.channels, + .num_channels = bmp180_chip_info.num_channels, + .avail_scan_masks = bmp180_chip_info.avail_scan_masks, + + .oversampling_temp_avail = bmp180_chip_info.oversampling_temp_avail, + .num_oversampling_temp_avail = + bmp180_chip_info.num_oversampling_temp_avail, + .oversampling_temp_default = bmp180_chip_info.oversampling_temp_default, + + .oversampling_press_avail = bmp180_chip_info.oversampling_press_avail, + .num_oversampling_press_avail = + bmp180_chip_info.num_oversampling_press_avail, + .oversampling_press_default = + bmp180_chip_info.oversampling_press_default, + + .temp_coeffs = bmp180_chip_info.temp_coeffs, + .temp_coeffs_type = bmp180_chip_info.temp_coeffs_type, + .press_coeffs = bmp180_chip_info.press_coeffs, + .press_coeffs_type = bmp180_chip_info.press_coeffs_type, + + .chip_config = bmp180_chip_info.chip_config, + .read_temp = bmp180_chip_info.read_temp, + .read_press = bmp180_chip_info.read_press, + .read_calib = bmp180_chip_info.read_calib, + .set_mode = bmp180_chip_info.set_mode, + .wait_conv = bmp180_chip_info.wait_conv, + + .trigger_probe = bmp085_trigger_probe, + .trigger_handler = 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 = iio_priv(indio_dev); @@ -3308,11 +3351,6 @@ int bmp280_common_probe(struct device *dev, * so we look for an IRQ if we have that. */ if (irq > 0) { - if (chip_id == BMP180_CHIP_ID) { - ret = bmp085_fetch_eoc_irq(dev, name, irq, data); - if (ret) - return ret; - } if (data->chip_info->trigger_probe) { ret = data->chip_info->trigger_probe(indio_dev); if (ret) diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/bmp280-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) } static const struct of_device_id bmp280_of_i2c_match[] = { - { .compatible = "bosch,bmp085", .data = &bmp180_chip_info }, + { .compatible = "bosch,bmp085", .data = &bmp085_chip_info }, { .compatible = "bosch,bmp180", .data = &bmp180_chip_info }, { .compatible = "bosch,bmp280", .data = &bmp280_chip_info }, { .compatible = "bosch,bme280", .data = &bme280_chip_info }, @@ -38,7 +38,7 @@ static const struct of_device_id bmp280_of_i2c_match[] = { MODULE_DEVICE_TABLE(of, bmp280_of_i2c_match); static const struct i2c_device_id bmp280_i2c_id[] = { - {"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/bmp280-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) } static const struct of_device_id bmp280_of_spi_match[] = { - { .compatible = "bosch,bmp085", .data = &bmp180_chip_info }, + { .compatible = "bosch,bmp085", .data = &bmp085_chip_info }, { .compatible = "bosch,bmp180", .data = &bmp180_chip_info }, { .compatible = "bosch,bmp181", .data = &bmp180_chip_info }, { .compatible = "bosch,bmp280", .data = &bmp280_chip_info }, @@ -126,7 +126,7 @@ static const struct of_device_id bmp280_of_spi_match[] = { MODULE_DEVICE_TABLE(of, bmp280_of_spi_match); static const struct spi_device_id bmp280_spi_id[] = { - { "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 754eda367941..1307eda6f283 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -529,6 +529,7 @@ struct bmp280_chip_info { }; /* 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;