From nobody Thu Oct 2 23:49:46 2025 Received: from mail.subdimension.ro (nalicastle.subdimension.ro [172.105.74.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CAE830F7F7; Wed, 10 Sep 2025 07:58:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=172.105.74.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757491095; cv=none; b=INm3Zwhcj/idtYQO77wTrbfH3RzFGQyxMSKsDE8FQ/uKSZfmCFlD10ANFrCzlnUrn7pPZIqIZQJFRYygyjHSo3ZUutPQ2+aXZECXdXzRjaPmM5Yv0zI+z3mmnhC2LHVKoUotRQE1FsUUhRhXjQnzVxZZYwIV0v0ledmbo7FwOqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757491095; c=relaxed/simple; bh=33OmVTDTil3fSdjFKRtBb9hG5ahtUBANoDGBne1gLwk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tQPiG6odef3/4eTpuz9qfR9SJTI7rqt2MH7yCNT5+6SSLIRTTQNzULm0OI+oXgoyuxEDN9p8wx9FR/W2aAoUqCtClB/KNBeyexkugj/WBH9Rludwspml9YoY1g8ClMaSj1rRcAafak47NACb+PjblZP+nPXbBzWsPW32nG5WmCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=subdimension.ro; spf=pass smtp.mailfrom=subdimension.ro; dkim=pass (2048-bit key) header.d=subdimension.ro header.i=@subdimension.ro header.b=RZzZM0Bz; arc=none smtp.client-ip=172.105.74.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=subdimension.ro Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=subdimension.ro Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=subdimension.ro header.i=@subdimension.ro header.b="RZzZM0Bz" Received: from [10.212.0.13] (unknown [IPv6:2a02:2f0e:3503:4a00:e2d5:5eff:fed9:f1c4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.subdimension.ro (Postfix) with ESMTPSA id 9C1CC173BF0; Wed, 10 Sep 2025 10:58:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subdimension.ro; s=mail; t=1757491085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r4Pa05WnLC5Ci62ccx10QOQDakxk9m0mEzup+FfOKgo=; b=RZzZM0Bzh4E/F2nisgCLXvU7A2ImNDcOCr84q4PNTpcvq0Qyoyq+oMzxa3Keqt7khZmFkx ZhxxnCRRAQW5WrLOin4Lo352uLcEqTOzZqD1vIVj0YC3cbocf8F/MJrK0CGpcR7MSLoQlz sTvzb/6kHSFR862SEFEfAw3RREExJiTG81jufqQwhshraPi8eWwZYLVjPs5Rd9tCcpP/vO +FYFRZhx+RJ/7/a61UDzW6N0OES1PFLgQD55KeF+V69HoXh44zYKX2DTbHHDAV5Yo21Xi5 XFHj2NSMau73qPqVK3Pi3uTbV3JYsPu8C6t2MXV9uLQ5HFu4dG0iRJEP6u3tEw== From: Petre Rodan Date: Wed, 10 Sep 2025 10:57:13 +0300 Subject: [PATCH v2 08/14] iio: accel: bma220: migrate to regmap API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250910-bma220_improvements-v2-8-e23f4f2b9745@subdimension.ro> References: <20250910-bma220_improvements-v2-0-e23f4f2b9745@subdimension.ro> In-Reply-To: <20250910-bma220_improvements-v2-0-e23f4f2b9745@subdimension.ro> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jonathan Cameron , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Petre Rodan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=16839; i=petre.rodan@subdimension.ro; h=from:subject:message-id; bh=33OmVTDTil3fSdjFKRtBb9hG5ahtUBANoDGBne1gLwk=; b=owEBbQKS/ZANAwAIAc8mmZmETn8wAcsmYgBowS+HQdvNCuIsw/S7tdqP3T+daUTN6p26SThxj vs7NxzCUn6JAjMEAAEIAB0WIQTYCn/BdhUZNew+X6nPJpmZhE5/MAUCaMEvhwAKCRDPJpmZhE5/ MNWVD/49BKZoXUZ+0c8GelVqB2HNDCHGxJKzK2mOATC8Xqvys42YsQzUPSkMEqwgAqutJJrIFG8 7d7DaW8wfM1DW4ppuGTdGxUsfBxMo4jV+e+esXdYLmXQecuJLu86G+IIy28oC1M+27yh7s2RCQ1 fUGx443zpXnAFKOo+SE8mnSsWm6clsbKwzHrBdgEUuRn5jl8HxWJWb/QeY+QIwa3uRR4ya5e9dS YX2D7tcDrIionx9RMmxFvyp/w2LkrDOKEC0d2cirzK2UfVn0HtKP2TAegNg22SGpq+AfKZTAlEe arn5P2Dw0PdXYor352+CvTjDdHquejnw8LW1x9qYPXNfq9Kt1TyC8zhpCtgzZhRcofmvrdIjAZa O/l9HmwhREmDzPUkpAEkI36P8+5id95TJ+iJWvyugKLMND52Dh9fI2cvpEGxaeNgruuj/HHeS94 HPM2wMAXBqbX4+SB0aHOgt2NTitcj9LGl66+BisMpkvFqr2L70AMBYWVsWXv0SrySBM8jou0SMQ snsjzwbxOiKoanD8pVdddvTryJfK0AJIQ8Y8TWyRTfpCtSJEoZae+cXhsvmd4rt3XwoQI6+4TJb mBINtKptbmBqFJBDGVpuQY+g2rIzphJOx6XM/I6AzI9/Hr+V3d9UKaRlNisYZmnIb0x408bxZ3r LtIzBoK1qfyLcxw== X-Developer-Key: i=petre.rodan@subdimension.ro; a=openpgp; fpr=D80A7FC176151935EC3E5FA9CF269999844E7F30 Switch to regmap API. Signed-off-by: Petre Rodan --- ChangeLog: - cleanup patch by splitting out unrelated changes --- drivers/iio/accel/Kconfig | 2 + drivers/iio/accel/bma220.h | 6 +- drivers/iio/accel/bma220_core.c | 266 ++++++++++++++++++++++++++++--------= ---- drivers/iio/accel/bma220_spi.c | 10 +- 4 files changed, 200 insertions(+), 84 deletions(-) diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 2cc3075e26883df60b5068c73b0551e1dd02c32e..9b6c35b759481df5ff3c91856f8= 783357d25de80 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -218,6 +218,7 @@ config BMA180 =20 config BMA220 tristate "Bosch BMA220 3-Axis Accelerometer Driver" + select REGMAP select IIO_BUFFER select IIO_TRIGGERED_BUFFER select BMA220_SPI if SPI @@ -231,6 +232,7 @@ config BMA220 =20 config BMA220_SPI tristate + select REGMAP_SPI depends on BMA220 =20 config BMA400 diff --git a/drivers/iio/accel/bma220.h b/drivers/iio/accel/bma220.h index eb311183ebfe37d1a75d858d435eac777efc4ed8..f9f4fa3daf33665f07f8bf07346= 8dff070b46d74 100644 --- a/drivers/iio/accel/bma220.h +++ b/drivers/iio/accel/bma220.h @@ -9,11 +9,11 @@ #define _BMA220_H =20 #include -#include +#include =20 +extern const struct regmap_config bma220_spi_regmap_config; extern const struct dev_pm_ops bma220_pm_ops; -struct spi_device; =20 -int bma220_common_probe(struct spi_device *dev); +int bma220_common_probe(struct device *dev, struct regmap *regmap, int irq= ); =20 #endif diff --git a/drivers/iio/accel/bma220_core.c b/drivers/iio/accel/bma220_cor= e.c index 322df516c90a7c645eeca579cae9803eb31caad1..4d8b65ea737a2d5fe74f98da13a= 582a80874a5af 100644 --- a/drivers/iio/accel/bma220_core.c +++ b/drivers/iio/accel/bma220_core.c @@ -3,17 +3,21 @@ * BMA220 Digital triaxial acceleration sensor driver * * Copyright (c) 2016,2020 Intel Corporation. + * Copyright (c) 2025 Petre Rodan */ =20 #include +#include +#include +#include #include #include #include #include #include +#include #include #include -#include =20 #include #include @@ -24,16 +28,64 @@ #include "bma220.h" =20 #define BMA220_REG_ID 0x00 +#define BMA220_REG_REVISION_ID 0x01 #define BMA220_REG_ACCEL_X 0x02 #define BMA220_REG_ACCEL_Y 0x03 #define BMA220_REG_ACCEL_Z 0x04 +#define BMA220_REG_CONF0 0x05 +#define BMA220_HIGH_DUR_MSK GENMASK(5, 0) +#define BMA220_HIGH_HY_MSK GENMASK(7, 6) +#define BMA220_REG_CONF1 0x06 +#define BMA220_HIGH_TH_MSK GENMASK(3, 0) +#define BMA220_LOW_TH_MSK GENMASK(7, 4) +#define BMA220_REG_CONF2 0x07 +#define BMA220_LOW_DUR_MSK GENMASK(5, 0) +#define BMA220_LOW_HY_MSK GENMASK(7, 6) +#define BMA220_REG_CONF3 0x08 +#define BMA220_TT_DUR_MSK GENMASK(2, 0) +#define BMA220_TT_TH_MSK GENMASK(6, 3) +#define BMA220_REG_CONF4 0x09 +#define BMA220_SLOPE_DUR_MSK GENMASK(1, 0) +#define BMA220_SLOPE_TH_MSK GENMASK(5, 2) +#define BMA220_REG_CONF5 0x0a +#define BMA220_TIP_EN_MSK BIT(4) +#define BMA220_REG_IF0 0x0b +#define BMA220_REG_IF1 0x0c +#define BMA220_IF_SLOPE BIT(0) +#define BMA220_IF_DRDY BIT(1) +#define BMA220_IF_HIGH BIT(2) +#define BMA220_IF_LOW BIT(3) +#define BMA220_IF_TT BIT(4) +#define BMA220_REG_IE0 0x0d +#define BMA220_INT_EN_TAP_Z_MSK BIT(0) +#define BMA220_INT_EN_TAP_Y_MSK BIT(1) +#define BMA220_INT_EN_TAP_X_MSK BIT(2) +#define BMA220_INT_EN_SLOPE_Z_MSK BIT(3) +#define BMA220_INT_EN_SLOPE_Y_MSK BIT(4) +#define BMA220_INT_EN_SLOPE_X_MSK BIT(5) +#define BMA220_INT_EN_DRDY_MSK BIT(7) +#define BMA220_REG_IE1 0x0e +#define BMA220_INT_EN_HIGH_Z_MSK BIT(0) +#define BMA220_INT_EN_HIGH_Y_MSK BIT(1) +#define BMA220_INT_EN_HIGH_X_MSK BIT(2) +#define BMA220_INT_EN_LOW_MSK BIT(3) +#define BMA220_INT_LATCH_MSK GENMASK(6, 4) +#define BMA220_INT_LATCH_MAX 0x7 +#define BMA220_INT_RST_MSK BIT(7) +#define BMA220_REG_IE2 0x0f +#define BMA220_REG_FILTER 0x10 +#define BMA220_FILTER_MASK GENMASK(3, 0) #define BMA220_REG_RANGE 0x11 +#define BMA220_RANGE_MASK GENMASK(1, 0) +#define BMA220_REG_WDT 0x17 +#define BMA220_WDT_MASK GENMASK(2, 1) +#define BMA220_WDT_OFF 0x0 +#define BMA220_WDT_1MS BIT(1) +#define BMA220_WDT_10MS GENMASK(1, 0) #define BMA220_REG_SUSPEND 0x18 #define BMA220_REG_SOFTRESET 0x19 =20 #define BMA220_CHIP_ID 0xDD -#define BMA220_READ_MASK BIT(7) -#define BMA220_RANGE_MASK GENMASK(1, 0) #define BMA220_SUSPEND_SLEEP 0xFF #define BMA220_SUSPEND_WAKE 0x00 #define BMA220_RESET_MODE 0xFF @@ -69,14 +121,15 @@ static const int bma220_scale_table[][2] =3D { }; =20 struct bma220_data { - struct spi_device *spi_device; + struct device *dev; + struct regmap *regmap; struct mutex lock; + u8 range_idx; struct { s8 chans[3]; /* Ensure timestamp is naturally aligned. */ aligned_s64 timestamp; - } scan; - u8 tx_buf[2] __aligned(IIO_DMA_MINALIGN); + } scan __aligned(IIO_DMA_MINALIGN); }; =20 static const struct iio_chan_spec bma220_channels[] =3D { @@ -86,35 +139,57 @@ static const struct iio_chan_spec bma220_channels[] = =3D { IIO_CHAN_SOFT_TIMESTAMP(3), }; =20 -static inline int bma220_read_reg(struct spi_device *spi, u8 reg) -{ - return spi_w8r8(spi, reg | BMA220_READ_MASK); -} - static const unsigned long bma220_accel_scan_masks[] =3D { BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z), 0 }; =20 +static bool bma220_is_writable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case BMA220_REG_CONF0: + case BMA220_REG_CONF1: + case BMA220_REG_CONF2: + case BMA220_REG_CONF3: + case BMA220_REG_CONF4: + case BMA220_REG_CONF5: + case BMA220_REG_IE0: + case BMA220_REG_IE1: + case BMA220_REG_IE2: + case BMA220_REG_FILTER: + case BMA220_REG_RANGE: + case BMA220_REG_WDT: + return true; + default: + return false; + } +} + +const struct regmap_config bma220_spi_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .read_flag_mask =3D BIT(7), + .max_register =3D BMA220_REG_SOFTRESET, + .cache_type =3D REGCACHE_NONE, + .writeable_reg =3D bma220_is_writable_reg, +}; +EXPORT_SYMBOL_NS_GPL(bma220_spi_regmap_config, "IIO_BOSCH_BMA220"); + static irqreturn_t bma220_trigger_handler(int irq, void *p) { int ret; struct iio_poll_func *pf =3D p; struct iio_dev *indio_dev =3D pf->indio_dev; struct bma220_data *data =3D iio_priv(indio_dev); - struct spi_device *spi =3D data->spi_device; =20 - mutex_lock(&data->lock); - data->tx_buf[0] =3D BMA220_REG_ACCEL_X | BMA220_READ_MASK; - ret =3D spi_write_then_read(spi, data->tx_buf, 1, &data->scan.chans, - ARRAY_SIZE(bma220_channels) - 1); + ret =3D regmap_bulk_read(data->regmap, BMA220_REG_ACCEL_X, + &data->scan.chans, + sizeof(data->scan.chans)); if (ret < 0) - goto err; + return IRQ_NONE; =20 iio_push_to_buffers_with_ts(indio_dev, &data->scan, sizeof(data->scan), - pf->timestamp); -err: - mutex_unlock(&data->lock); + iio_get_time_ns(indio_dev)); iio_trigger_notify_done(indio_dev->trig); =20 return IRQ_HANDLED; @@ -125,58 +200,65 @@ static int bma220_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { int ret; - u8 range_idx; + u8 index; + unsigned int reg; struct bma220_data *data =3D iio_priv(indio_dev); =20 switch (mask) { case IIO_CHAN_INFO_RAW: - ret =3D bma220_read_reg(data->spi_device, chan->address); + ret =3D regmap_read(data->regmap, chan->address, ®); if (ret < 0) return -EINVAL; - *val =3D sign_extend32(ret >> chan->scan_type.shift, + *val =3D sign_extend32(reg >> chan->scan_type.shift, chan->scan_type.realbits - 1); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - ret =3D bma220_read_reg(data->spi_device, BMA220_REG_RANGE); - if (ret < 0) - return ret; - range_idx =3D ret & BMA220_RANGE_MASK; - *val =3D bma220_scale_table[range_idx][0]; - *val2 =3D bma220_scale_table[range_idx][1]; + index =3D data->range_idx; + *val =3D bma220_scale_table[index][0]; + *val2 =3D bma220_scale_table[index][1]; return IIO_VAL_INT_PLUS_MICRO; } =20 return -EINVAL; } =20 +static int bma220_find_match_2dt(const int (*tbl)[2], const int n, + const int val, const int val2) +{ + int i; + + for (i =3D 0; i < n; i++) { + if (tbl[i][0] =3D=3D val && tbl[i][1] =3D=3D val2) + return i; + } + + return -EINVAL; +} + static int bma220_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask) { - int i; int ret; int index =3D -1; struct bma220_data *data =3D iio_priv(indio_dev); =20 + guard(mutex)(&data->lock); + switch (mask) { case IIO_CHAN_INFO_SCALE: - for (i =3D 0; i < ARRAY_SIZE(bma220_scale_table); i++) - if (val =3D=3D bma220_scale_table[i][0] && - val2 =3D=3D bma220_scale_table[i][1]) { - index =3D i; - break; - } + index =3D bma220_find_match_2dt(bma220_scale_table, + ARRAY_SIZE(bma220_scale_table), + val, val2); if (index < 0) return -EINVAL; =20 - mutex_lock(&data->lock); - data->tx_buf[0] =3D BMA220_REG_RANGE; - data->tx_buf[1] =3D index; - ret =3D spi_write(data->spi_device, data->tx_buf, - sizeof(data->tx_buf)); + ret =3D regmap_update_bits(data->regmap, BMA220_REG_RANGE, + BMA220_RANGE_MASK, + FIELD_PREP(BMA220_RANGE_MASK, index)); if (ret < 0) return ret; - mutex_unlock(&data->lock); + data->range_idx =3D index; =20 return 0; } @@ -206,9 +288,12 @@ static const struct iio_info bma220_info =3D { .read_avail =3D bma220_read_avail, }; =20 -static int bma220_reset(struct spi_device *spi, bool up) +static int bma220_reset(struct bma220_data *data, bool up) { int i, ret; + unsigned int val; + + guard(mutex)(&data->lock); =20 /** * The chip can be reset by a simple register read. @@ -216,89 +301,113 @@ static int bma220_reset(struct spi_device *spi, bool= up) * to make sure that the device is in the desired state. */ for (i =3D 0; i < 2; i++) { - ret =3D bma220_read_reg(spi, BMA220_REG_SOFTRESET); + ret =3D regmap_read(data->regmap, BMA220_REG_SOFTRESET, &val); if (ret < 0) return ret; =20 - if (up && (ret =3D=3D BMA220_RESET_MODE)) + if (up && (val =3D=3D BMA220_RESET_MODE)) return 0; =20 - if (!up && (ret =3D=3D BMA220_NONRESET_MODE)) + if (!up && (val =3D=3D BMA220_NONRESET_MODE)) return 0; } =20 return -EBUSY; } =20 -static int bma220_power(struct spi_device *spi, bool up) +static int bma220_power(struct bma220_data *data, bool up) { int i, ret; + unsigned int val; =20 + guard(mutex)(&data->lock); /** * The chip can be suspended/woken up by a simple register read. * So, we need up to 2 register reads of the suspend register * to make sure that the device is in the desired state. */ for (i =3D 0; i < 2; i++) { - ret =3D bma220_read_reg(spi, BMA220_REG_SUSPEND); + ret =3D regmap_read(data->regmap, BMA220_REG_SUSPEND, &val); if (ret < 0) return ret; =20 - if (up && (ret =3D=3D BMA220_SUSPEND_SLEEP)) + if (up && (val =3D=3D BMA220_SUSPEND_SLEEP)) return 0; =20 - if (!up && (ret =3D=3D BMA220_SUSPEND_WAKE)) + if (!up && (val =3D=3D BMA220_SUSPEND_WAKE)) return 0; } =20 return -EBUSY; } =20 -static int bma220_init(struct spi_device *spi) + +static int bma220_init(struct bma220_data *data) { int ret; + unsigned int val; + struct device *dev =3D data->dev; static const char * const regulator_names[] =3D { "vddd", "vddio", "vdda"= }; =20 - ret =3D devm_regulator_bulk_get_enable(&spi->dev, + ret =3D devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulator_names), regulator_names); if (ret) - return dev_err_probe(&spi->dev, ret, "Failed to get regulators\n"); + return dev_err_probe(dev, ret, "Failed to get regulators\n"); =20 - ret =3D bma220_read_reg(spi, BMA220_REG_ID); - if (ret !=3D BMA220_CHIP_ID) + /* Try to read chip_id register. It must return 0xdd. */ + ret =3D regmap_read(data->regmap, BMA220_REG_ID, &val); + if (ret) + return dev_err_probe(dev, ret, + "Failed to read chip id register\n"); + + if (val !=3D BMA220_CHIP_ID) return -ENODEV; =20 - /* Make sure the chip is powered on and config registers are reset */ - ret =3D bma220_power(spi, true); + ret =3D bma220_power(data, true); if (ret) - return dev_err_probe(&spi->dev, ret, "Failed to power-on chip\n"); + return dev_err_probe(dev, ret, "Failed to power-on chip\n"); =20 - ret =3D bma220_reset(spi, true); + ret =3D bma220_reset(data, true); if (ret) - return dev_err_probe(&spi->dev, ret, "Failed to soft reset chip\n"); + return dev_err_probe(dev, ret, "Failed to soft reset chip\n"); =20 return 0; } =20 -static void bma220_deinit(void *spi) +static void bma220_deinit(void *data_ptr) { - bma220_power(spi, false); + struct bma220_data *data =3D data_ptr; + int ret; + + ret =3D bma220_power(data, false); + if (ret) + dev_warn(data->dev, + "Failed to put device into suspend mode (%pe)\n", + ERR_PTR(ret)); } =20 -int bma220_common_probe(struct spi_device *spi) +int bma220_common_probe(struct device *dev, struct regmap *regmap, int irq) { int ret; struct iio_dev *indio_dev; struct bma220_data *data; =20 - indio_dev =3D devm_iio_device_alloc(&spi->dev, sizeof(*data)); + indio_dev =3D devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) return -ENOMEM; =20 data =3D iio_priv(indio_dev); - data->spi_device =3D spi; - mutex_init(&data->lock); + data->regmap =3D regmap; + data->dev =3D dev; + + ret =3D bma220_init(data); + if (ret) + return ret; + + ret =3D devm_mutex_init(dev, &data->lock); + if (ret) + return ret; =20 indio_dev->info =3D &bma220_info; indio_dev->name =3D BMA220_DEVICE_NAME; @@ -307,38 +416,35 @@ int bma220_common_probe(struct spi_device *spi) indio_dev->num_channels =3D ARRAY_SIZE(bma220_channels); indio_dev->available_scan_masks =3D bma220_accel_scan_masks; =20 - ret =3D bma220_init(data->spi_device); + ret =3D devm_add_action_or_reset(dev, bma220_deinit, data); if (ret) return ret; =20 - ret =3D devm_add_action_or_reset(&spi->dev, bma220_deinit, spi); - if (ret) - return ret; - - ret =3D devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, - iio_pollfunc_store_time, + ret =3D devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, bma220_trigger_handler, NULL); if (ret < 0) { - dev_err(&spi->dev, "iio triggered buffer setup failed\n"); + dev_err(dev, "iio triggered buffer setup failed\n"); return ret; } =20 - return devm_iio_device_register(&spi->dev, indio_dev); + return devm_iio_device_register(dev, indio_dev); } -EXPORT_SYMBOL_NS(bma220_common_probe, "IIO_BOSCH_BMA220"); +EXPORT_SYMBOL_NS_GPL(bma220_common_probe, "IIO_BOSCH_BMA220"); =20 static int bma220_suspend(struct device *dev) { - struct spi_device *spi =3D to_spi_device(dev); + struct iio_dev *indio_dev =3D dev_get_drvdata(dev); + struct bma220_data *data =3D iio_priv(indio_dev); =20 - return bma220_power(spi, false); + return bma220_power(data, false); } =20 static int bma220_resume(struct device *dev) { - struct spi_device *spi =3D to_spi_device(dev); + struct iio_dev *indio_dev =3D dev_get_drvdata(dev); + struct bma220_data *data =3D iio_priv(indio_dev); =20 - return bma220_power(spi, true); + return bma220_power(data, true); } EXPORT_NS_SIMPLE_DEV_PM_OPS(bma220_pm_ops, bma220_suspend, bma220_resume, IIO_BOSCH_BMA220); diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c index 78820d90e39119d9755b6266a8329e11ffd55723..7364428b3e363950d3be2a03b76= 57a2f0315fc5b 100644 --- a/drivers/iio/accel/bma220_spi.c +++ b/drivers/iio/accel/bma220_spi.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include =20 @@ -18,7 +19,14 @@ =20 static int bma220_spi_probe(struct spi_device *spi) { - return bma220_common_probe(spi); + struct regmap *regmap; + + regmap =3D devm_regmap_init_spi(spi, &bma220_spi_regmap_config); + if (IS_ERR(regmap)) + return dev_err_probe(&spi->dev, PTR_ERR(regmap), + "failed to create regmap\n"); + + return bma220_common_probe(&spi->dev, regmap, spi->irq); } =20 static const struct spi_device_id bma220_spi_id[] =3D { --=20 2.49.1