Linux IIO development
 help / color / mirror / Atom feed
* [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support
@ 2025-01-12 12:25 Vasiliy Doylov via B4 Relay
  2025-01-12 12:25 ` [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c Vasiliy Doylov via B4 Relay
                   ` (4 more replies)
  0 siblings, 5 replies; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

Changes includes:
- Add mount matrix handling
- Add match table to work with DT
- Add MC3510C support

MC3510C use same registors as MC3230, but different value scale.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
Changes in v2:
- Ordered commits
- Fixed comment style
- Ordered struct members
- Fixed device table
- MC5310C commit splitted
- Link to v1: https://lore.kernel.org/r/20250111-mainlining-mc3510c-v1-0-57be503addf8@gmail.com

Changes in v3:
- Fixed patch (poped stash)
- Link to v2: https://lore.kernel.org/all/20250112-mainlining-mc3510c-v2-0-322804a545cf@gmail.com

---
Vasiliy Doylov (5):
      dt-bindings: iio: accel: mc3230: document mc3510c
      iio: accel: mc3230: add mount matrix support
      iio: accel: mc3230: add OF match table
      iio: accel: mc3230: add multiple devices support
      iio: accel: mc3230: add mc3510c support

 .../devicetree/bindings/trivial-devices.yaml       |  2 +
 drivers/iio/accel/mc3230.c                         | 93 ++++++++++++++++++----
 2 files changed, 79 insertions(+), 16 deletions(-)
---
base-commit: 2b88851f583d3c4e40bcd40cfe1965241ec229dd
change-id: 20250111-mainlining-mc3510c-564702fba487

Best regards,
-- 
Vasiliy Doylov <nekodevelopper@gmail.com>



^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c
  2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
@ 2025-01-12 12:25 ` Vasiliy Doylov via B4 Relay
  2025-01-13  8:49   ` Krzysztof Kozlowski
  2025-01-12 12:25 ` [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support Vasiliy Doylov via B4 Relay
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

From: Vasiliy Doylov <nekodevelopper@gmail.com>

The MC3510C is a 3 asix digital accelerometer.
It handled by the same driver as MC3230.
Document it as a trivial device.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
 Documentation/devicetree/bindings/trivial-devices.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index fadbd3c041c8c39faedfe62874d4eba25a0bf30e..6c34e4c0dcc6df5a4d8edc5effb80980de820db9 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -187,6 +187,8 @@ properties:
           - maxim,max6621
             # mCube 3-axis 8-bit digital accelerometer
           - mcube,mc3230
+            # mCube 3-axis 8-bit digital accelerometer
+          - mcube,mc3510c
             # Measurement Specialities I2C temperature and humidity sensor
           - meas,htu21
             # Measurement Specialities I2C pressure and temperature sensor

-- 
2.47.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support
  2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
  2025-01-12 12:25 ` [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c Vasiliy Doylov via B4 Relay
@ 2025-01-12 12:25 ` Vasiliy Doylov via B4 Relay
  2025-01-12 16:28   ` Jonathan Cameron
  2025-01-12 12:25 ` [PATCH v3 3/5] iio: accel: mc3230: add OF match table Vasiliy Doylov via B4 Relay
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

From: Vasiliy Doylov <nekodevelopper@gmail.com>

This patch allows to read a mount-matrix device tree
property and report to user-space or in-kernel iio clients.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
 drivers/iio/accel/mc3230.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index caa40a14a6316acae3a972f0ebe0b325db96eb44..a153a3f715ed7f2f1417618715767f265b49191d 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -44,18 +44,34 @@ static const int mc3230_nscale = 115411765;
 	.channel2 = IIO_MOD_##axis,	\
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
+	.ext_info = mc3230_ext_info, \
 }
 
+struct mc3230_data {
+	struct i2c_client *client;
+	struct iio_mount_matrix orientation;
+};
+
+static const struct iio_mount_matrix *
+mc3230_get_mount_matrix(const struct iio_dev *indio_dev,
+			const struct iio_chan_spec *chan)
+{
+	struct mc3230_data *data = iio_priv(indio_dev);
+
+	return &data->orientation;
+}
+
+static const struct iio_chan_spec_ext_info mc3230_ext_info[] = {
+	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, mc3230_get_mount_matrix),
+	{}
+};
+
 static const struct iio_chan_spec mc3230_channels[] = {
 	MC3230_CHANNEL(MC3230_REG_XOUT, X),
 	MC3230_CHANNEL(MC3230_REG_YOUT, Y),
 	MC3230_CHANNEL(MC3230_REG_ZOUT, Z),
 };
 
-struct mc3230_data {
-	struct i2c_client *client;
-};
-
 static int mc3230_set_opcon(struct mc3230_data *data, int opcon)
 {
 	int ret;
@@ -141,6 +157,10 @@ static int mc3230_probe(struct i2c_client *client)
 	if (ret < 0)
 		return ret;
 
+	ret = iio_read_mount_matrix(&client->dev, &data->orientation);
+	if (ret)
+		return ret;
+
 	ret = iio_device_register(indio_dev);
 	if (ret < 0) {
 		dev_err(&client->dev, "device_register failed\n");

-- 
2.47.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v3 3/5] iio: accel: mc3230: add OF match table
  2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
  2025-01-12 12:25 ` [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c Vasiliy Doylov via B4 Relay
  2025-01-12 12:25 ` [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support Vasiliy Doylov via B4 Relay
@ 2025-01-12 12:25 ` Vasiliy Doylov via B4 Relay
  2025-01-12 16:29   ` Jonathan Cameron
  2025-01-12 12:25 ` [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Vasiliy Doylov via B4 Relay
  2025-01-12 12:25 ` [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support Vasiliy Doylov via B4 Relay
  4 siblings, 1 reply; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

From: Vasiliy Doylov <nekodevelopper@gmail.com>

This will make the driver auto loaded via device-tree.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
 drivers/iio/accel/mc3230.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index a153a3f715ed7f2f1417618715767f265b49191d..ba30c904d3f67002deeb3ca5a7e12bfae312e05f 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -205,9 +205,16 @@ static const struct i2c_device_id mc3230_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
 
+static const struct of_device_id mc3230_of_match[] = {
+	{ .compatible = "mcube,mc3230" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, mc3230_of_match);
+
 static struct i2c_driver mc3230_driver = {
 	.driver = {
 		.name = "mc3230",
+		.of_match_table = mc3230_of_match,
 		.pm = pm_sleep_ptr(&mc3230_pm_ops),
 	},
 	.probe		= mc3230_probe,

-- 
2.47.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support
  2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
                   ` (2 preceding siblings ...)
  2025-01-12 12:25 ` [PATCH v3 3/5] iio: accel: mc3230: add OF match table Vasiliy Doylov via B4 Relay
@ 2025-01-12 12:25 ` Vasiliy Doylov via B4 Relay
  2025-01-12 16:32   ` Jonathan Cameron
  2025-01-13  8:51   ` Krzysztof Kozlowski
  2025-01-12 12:25 ` [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support Vasiliy Doylov via B4 Relay
  4 siblings, 2 replies; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

From: Vasiliy Doylov <nekodevelopper@gmail.com>

This patch allows to add new devices to this driver.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
 drivers/iio/accel/mc3230.c | 50 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index ba30c904d3f67002deeb3ca5a7e12bfae312e05f..1b58f3ea50655b6563a78a2531b16a8088e8f8d5 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -22,20 +22,29 @@
 #define MC3230_MODE_OPCON_STANDBY	0x03
 
 #define MC3230_REG_CHIP_ID		0x18
-#define MC3230_CHIP_ID			0x01
-
 #define MC3230_REG_PRODUCT_CODE		0x3b
-#define MC3230_PRODUCT_CODE		0x19
 
 /*
  * The accelerometer has one measurement range:
  *
  * -1.5g - +1.5g (8-bit, signed)
  *
- * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1)	= 0.115411765
  */
 
-static const int mc3230_nscale = 115411765;
+struct mc3230_chip_info {
+	const u8 chip_id;
+	const char *name;
+	const u8 product_code;
+	const int scale;
+};
+
+static struct mc3230_chip_info mc3230_chip_info = {
+	.chip_id = 0x01,
+	.name = "mc3230",
+	.product_code = 0x19,
+	/* (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765 */
+	.scale = 115411765,
+};
 
 #define MC3230_CHANNEL(reg, axis) {	\
 	.type = IIO_ACCEL,	\
@@ -48,6 +57,7 @@ static const int mc3230_nscale = 115411765;
 }
 
 struct mc3230_data {
+	const struct mc3230_chip_info *chip_info;
 	struct i2c_client *client;
 	struct iio_mount_matrix orientation;
 };
@@ -111,7 +121,7 @@ static int mc3230_read_raw(struct iio_dev *indio_dev,
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
 		*val = 0;
-		*val2 = mc3230_nscale;
+		*val2 = data->chip_info->scale;
 		return IIO_VAL_INT_PLUS_NANO;
 	default:
 		return -EINVAL;
@@ -127,15 +137,28 @@ static int mc3230_probe(struct i2c_client *client)
 	int ret;
 	struct iio_dev *indio_dev;
 	struct mc3230_data *data;
+	const struct mc3230_chip_info *chip_info;
+
+	chip_info = i2c_get_match_data(client);
+	if (chip_info == NULL) {
+		dev_err(&client->dev, "failed to get match data");
+		return -ENODATA;
+	}
 
 	/* First check chip-id and product-id */
 	ret = i2c_smbus_read_byte_data(client, MC3230_REG_CHIP_ID);
-	if (ret != MC3230_CHIP_ID)
-		return (ret < 0) ? ret : -ENODEV;
+	if (ret != chip_info->chip_id) {
+		dev_info(&client->dev,
+			"chip id check fail: 0x%x != 0x%x !\n",
+			ret, chip_info->chip_id);
+	}
 
 	ret = i2c_smbus_read_byte_data(client, MC3230_REG_PRODUCT_CODE);
-	if (ret != MC3230_PRODUCT_CODE)
-		return (ret < 0) ? ret : -ENODEV;
+	if (ret != chip_info->product_code) {
+		dev_info(&client->dev,
+			"product code check fail: 0x%x != 0x%x !\n",
+			ret, chip_info->product_code);
+	}
 
 	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
 	if (!indio_dev) {
@@ -144,11 +167,12 @@ static int mc3230_probe(struct i2c_client *client)
 	}
 
 	data = iio_priv(indio_dev);
+	data->chip_info = chip_info;
 	data->client = client;
 	i2c_set_clientdata(client, indio_dev);
 
 	indio_dev->info = &mc3230_info;
-	indio_dev->name = "mc3230";
+	indio_dev->name = chip_info->name;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->channels = mc3230_channels;
 	indio_dev->num_channels = ARRAY_SIZE(mc3230_channels);
@@ -200,13 +224,13 @@ static int mc3230_resume(struct device *dev)
 static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
 
 static const struct i2c_device_id mc3230_i2c_id[] = {
-	{ "mc3230" },
+	{ "mc3230", (kernel_ulong_t)&mc3230_chip_info },
 	{}
 };
 MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
 
 static const struct of_device_id mc3230_of_match[] = {
-	{ .compatible = "mcube,mc3230" },
+	{ .compatible = "mcube,mc3230", &mc3230_chip_info },
 	{}
 };
 MODULE_DEVICE_TABLE(of, mc3230_of_match);

-- 
2.47.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support
  2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
                   ` (3 preceding siblings ...)
  2025-01-12 12:25 ` [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Vasiliy Doylov via B4 Relay
@ 2025-01-12 12:25 ` Vasiliy Doylov via B4 Relay
  2025-01-12 16:34   ` Jonathan Cameron
  2025-01-13  8:51   ` Krzysztof Kozlowski
  4 siblings, 2 replies; 14+ messages in thread
From: Vasiliy Doylov via B4 Relay @ 2025-01-12 12:25 UTC (permalink / raw)
  To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-iio, linux-kernel, devicetree, Vasiliy Doylov

From: Vasiliy Doylov <nekodevelopper@gmail.com>

This commit integrates support for the mc3510c into the mc3230 driver.

Tested on Huawei MediaPad T3 10 (huawei-agassi)

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
---
 drivers/iio/accel/mc3230.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index 1b58f3ea50655b6563a78a2531b16a8088e8f8d5..92934975edc77b11ed6dc3da077a28d317314fab 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -46,6 +46,14 @@ static struct mc3230_chip_info mc3230_chip_info = {
 	.scale = 115411765,
 };
 
+static struct mc3230_chip_info mc3510c_chip_info = {
+	.chip_id = 0x23,
+	.name = "mc3510c",
+	.product_code = 0x10,
+	/* Was obtained empirically */
+	.scale = 625000000,
+};
+
 #define MC3230_CHANNEL(reg, axis) {	\
 	.type = IIO_ACCEL,	\
 	.address = reg,	\
@@ -225,12 +233,14 @@ static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
 
 static const struct i2c_device_id mc3230_i2c_id[] = {
 	{ "mc3230", (kernel_ulong_t)&mc3230_chip_info },
+	{ "mc3510c", (kernel_ulong_t)&mc3510c_chip_info },
 	{}
 };
 MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
 
 static const struct of_device_id mc3230_of_match[] = {
 	{ .compatible = "mcube,mc3230", &mc3230_chip_info },
+	{ .compatible = "mcube,mc3510c", &mc3510c_chip_info },
 	{}
 };
 MODULE_DEVICE_TABLE(of, mc3230_of_match);

-- 
2.47.1



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support
  2025-01-12 12:25 ` [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support Vasiliy Doylov via B4 Relay
@ 2025-01-12 16:28   ` Jonathan Cameron
  0 siblings, 0 replies; 14+ messages in thread
From: Jonathan Cameron @ 2025-01-12 16:28 UTC (permalink / raw)
  To: Vasiliy Doylov via B4 Relay
  Cc: nekodevelopper, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, 12 Jan 2025 15:25:36 +0300
Vasiliy Doylov via B4 Relay <devnull+nekodevelopper.gmail.com@kernel.org> wrote:

> From: Vasiliy Doylov <nekodevelopper@gmail.com>
> 
> This patch allows to read a mount-matrix device tree
> property and report to user-space or in-kernel iio clients.
> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
> ---
>  drivers/iio/accel/mc3230.c | 28 ++++++++++++++++++++++++----
>  1 file changed, 24 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index caa40a14a6316acae3a972f0ebe0b325db96eb44..a153a3f715ed7f2f1417618715767f265b49191d 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -44,18 +44,34 @@ static const int mc3230_nscale = 115411765;
>  	.channel2 = IIO_MOD_##axis,	\
>  	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
>  	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
> +	.ext_info = mc3230_ext_info, \
>  }
>  
> +struct mc3230_data {
> +	struct i2c_client *client;
> +	struct iio_mount_matrix orientation;
> +};
> +
> +static const struct iio_mount_matrix *
> +mc3230_get_mount_matrix(const struct iio_dev *indio_dev,
> +			const struct iio_chan_spec *chan)
> +{
> +	struct mc3230_data *data = iio_priv(indio_dev);
> +
> +	return &data->orientation;
> +}
> +
> +static const struct iio_chan_spec_ext_info mc3230_ext_info[] = {
> +	IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, mc3230_get_mount_matrix),
> +	{}
Trivial but if you are going around again for some other reason:
I'm (slowly) trying to standarize on { } (with a space) for these terminators in IIO.

> +};
> +
>  static const struct iio_chan_spec mc3230_channels[] = {
>  	MC3230_CHANNEL(MC3230_REG_XOUT, X),
>  	MC3230_CHANNEL(MC3230_REG_YOUT, Y),
>  	MC3230_CHANNEL(MC3230_REG_ZOUT, Z),
>  };
>  
> -struct mc3230_data {
> -	struct i2c_client *client;
> -};
> -
>  static int mc3230_set_opcon(struct mc3230_data *data, int opcon)
>  {
>  	int ret;
> @@ -141,6 +157,10 @@ static int mc3230_probe(struct i2c_client *client)
>  	if (ret < 0)
>  		return ret;
>  
> +	ret = iio_read_mount_matrix(&client->dev, &data->orientation);
> +	if (ret)
> +		return ret;
> +
>  	ret = iio_device_register(indio_dev);
>  	if (ret < 0) {
>  		dev_err(&client->dev, "device_register failed\n");
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 3/5] iio: accel: mc3230: add OF match table
  2025-01-12 12:25 ` [PATCH v3 3/5] iio: accel: mc3230: add OF match table Vasiliy Doylov via B4 Relay
@ 2025-01-12 16:29   ` Jonathan Cameron
  2025-01-12 16:38     ` Vasiliy Doylov
  0 siblings, 1 reply; 14+ messages in thread
From: Jonathan Cameron @ 2025-01-12 16:29 UTC (permalink / raw)
  To: Vasiliy Doylov via B4 Relay
  Cc: nekodevelopper, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, 12 Jan 2025 15:25:37 +0300
Vasiliy Doylov via B4 Relay <devnull+nekodevelopper.gmail.com@kernel.org> wrote:

> From: Vasiliy Doylov <nekodevelopper@gmail.com>
> 
> This will make the driver auto loaded via device-tree.
Are you sure that didn't previously work?  I thought there were
fallbacks that would make it use the driver name if nothing else matched.

> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
> ---
>  drivers/iio/accel/mc3230.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index a153a3f715ed7f2f1417618715767f265b49191d..ba30c904d3f67002deeb3ca5a7e12bfae312e05f 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -205,9 +205,16 @@ static const struct i2c_device_id mc3230_i2c_id[] = {
>  };
>  MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
>  
> +static const struct of_device_id mc3230_of_match[] = {
> +	{ .compatible = "mcube,mc3230" },
> +	{}
{ } 
here as well. 
> +};
> +MODULE_DEVICE_TABLE(of, mc3230_of_match);
> +
>  static struct i2c_driver mc3230_driver = {
>  	.driver = {
>  		.name = "mc3230",
> +		.of_match_table = mc3230_of_match,
>  		.pm = pm_sleep_ptr(&mc3230_pm_ops),
>  	},
>  	.probe		= mc3230_probe,
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support
  2025-01-12 12:25 ` [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Vasiliy Doylov via B4 Relay
@ 2025-01-12 16:32   ` Jonathan Cameron
  2025-01-13  8:51   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 14+ messages in thread
From: Jonathan Cameron @ 2025-01-12 16:32 UTC (permalink / raw)
  To: Vasiliy Doylov via B4 Relay
  Cc: nekodevelopper, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, 12 Jan 2025 15:25:38 +0300
Vasiliy Doylov via B4 Relay <devnull+nekodevelopper.gmail.com@kernel.org> wrote:

> From: Vasiliy Doylov <nekodevelopper@gmail.com>
> 
> This patch allows to add new devices to this driver.
> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
One comment inline.

Jonathan

> ---
>  drivers/iio/accel/mc3230.c | 50 ++++++++++++++++++++++++++++++++++------------
>  1 file changed, 37 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index ba30c904d3f67002deeb3ca5a7e12bfae312e05f..1b58f3ea50655b6563a78a2531b16a8088e8f8d5 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -22,20 +22,29 @@
>  #define MC3230_MODE_OPCON_STANDBY	0x03
>  
>  #define MC3230_REG_CHIP_ID		0x18
> -#define MC3230_CHIP_ID			0x01
> -
>  #define MC3230_REG_PRODUCT_CODE		0x3b
> -#define MC3230_PRODUCT_CODE		0x19
>  
>  /*
>   * The accelerometer has one measurement range:
>   *
>   * -1.5g - +1.5g (8-bit, signed)
>   *
> - * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1)	= 0.115411765
>   */
>  
> -static const int mc3230_nscale = 115411765;
> +struct mc3230_chip_info {
> +	const u8 chip_id;
> +	const char *name;
> +	const u8 product_code;

Keep chip_id and product_code together.  They are coming from
the same place and closely related fields.  Original
ordering in v1 made more sense than this.

> +	const int scale;
> +};
> +
> +static struct mc3230_chip_info mc3230_chip_info = {
> +	.chip_id = 0x01,
> +	.name = "mc3230",
> +	.product_code = 0x19,
> +	/* (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765 */
> +	.scale = 115411765,
> +};
>  
>  #define MC3230_CHANNEL(reg, axis) {	\
>  	.type = IIO_ACCEL,	\
> @@ -48,6 +57,7 @@ static const int mc3230_nscale = 115411765;
>  }
>  
>  struct mc3230_data {
> +	const struct mc3230_chip_info *chip_info;
>  	struct i2c_client *client;
>  	struct iio_mount_matrix orientation;
>  };
> @@ -111,7 +121,7 @@ static int mc3230_read_raw(struct iio_dev *indio_dev,
>  		return IIO_VAL_INT;
>  	case IIO_CHAN_INFO_SCALE:
>  		*val = 0;
> -		*val2 = mc3230_nscale;
> +		*val2 = data->chip_info->scale;
>  		return IIO_VAL_INT_PLUS_NANO;
>  	default:
>  		return -EINVAL;
> @@ -127,15 +137,28 @@ static int mc3230_probe(struct i2c_client *client)
>  	int ret;
>  	struct iio_dev *indio_dev;
>  	struct mc3230_data *data;
> +	const struct mc3230_chip_info *chip_info;
> +
> +	chip_info = i2c_get_match_data(client);
> +	if (chip_info == NULL) {
> +		dev_err(&client->dev, "failed to get match data");
> +		return -ENODATA;
> +	}
>  
>  	/* First check chip-id and product-id */
>  	ret = i2c_smbus_read_byte_data(client, MC3230_REG_CHIP_ID);
> -	if (ret != MC3230_CHIP_ID)
> -		return (ret < 0) ? ret : -ENODEV;
> +	if (ret != chip_info->chip_id) {
> +		dev_info(&client->dev,
> +			"chip id check fail: 0x%x != 0x%x !\n",
> +			ret, chip_info->chip_id);
> +	}
>  
>  	ret = i2c_smbus_read_byte_data(client, MC3230_REG_PRODUCT_CODE);
> -	if (ret != MC3230_PRODUCT_CODE)
> -		return (ret < 0) ? ret : -ENODEV;
> +	if (ret != chip_info->product_code) {
> +		dev_info(&client->dev,
> +			"product code check fail: 0x%x != 0x%x !\n",
> +			ret, chip_info->product_code);
> +	}
>  
>  	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
>  	if (!indio_dev) {
> @@ -144,11 +167,12 @@ static int mc3230_probe(struct i2c_client *client)
>  	}
>  
>  	data = iio_priv(indio_dev);
> +	data->chip_info = chip_info;
>  	data->client = client;
>  	i2c_set_clientdata(client, indio_dev);
>  
>  	indio_dev->info = &mc3230_info;
> -	indio_dev->name = "mc3230";
> +	indio_dev->name = chip_info->name;
>  	indio_dev->modes = INDIO_DIRECT_MODE;
>  	indio_dev->channels = mc3230_channels;
>  	indio_dev->num_channels = ARRAY_SIZE(mc3230_channels);
> @@ -200,13 +224,13 @@ static int mc3230_resume(struct device *dev)
>  static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
>  
>  static const struct i2c_device_id mc3230_i2c_id[] = {
> -	{ "mc3230" },
> +	{ "mc3230", (kernel_ulong_t)&mc3230_chip_info },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
>  
>  static const struct of_device_id mc3230_of_match[] = {
> -	{ .compatible = "mcube,mc3230" },
> +	{ .compatible = "mcube,mc3230", &mc3230_chip_info },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, mc3230_of_match);
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support
  2025-01-12 12:25 ` [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support Vasiliy Doylov via B4 Relay
@ 2025-01-12 16:34   ` Jonathan Cameron
  2025-01-13  8:51   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 14+ messages in thread
From: Jonathan Cameron @ 2025-01-12 16:34 UTC (permalink / raw)
  To: Vasiliy Doylov via B4 Relay
  Cc: nekodevelopper, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, 12 Jan 2025 15:25:39 +0300
Vasiliy Doylov via B4 Relay <devnull+nekodevelopper.gmail.com@kernel.org> wrote:

> From: Vasiliy Doylov <nekodevelopper@gmail.com>
> 
> This commit integrates support for the mc3510c into the mc3230 driver.
> 
> Tested on Huawei MediaPad T3 10 (huawei-agassi)
> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
Looks good to me.

If nothing else comes up in review you can either send a v4 with the
minor things I mentioned, or I'll just pick this up and tweak it whilst
applying.  For now it should stay on list for a few days for other people
to comment on if they wish and the trivial-devices entry to get reviewed.

Thanks,

Jonathan

> ---
>  drivers/iio/accel/mc3230.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index 1b58f3ea50655b6563a78a2531b16a8088e8f8d5..92934975edc77b11ed6dc3da077a28d317314fab 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -46,6 +46,14 @@ static struct mc3230_chip_info mc3230_chip_info = {
>  	.scale = 115411765,
>  };
>  
> +static struct mc3230_chip_info mc3510c_chip_info = {
> +	.chip_id = 0x23,
> +	.name = "mc3510c",
> +	.product_code = 0x10,
> +	/* Was obtained empirically */
> +	.scale = 625000000,
> +};
> +
>  #define MC3230_CHANNEL(reg, axis) {	\
>  	.type = IIO_ACCEL,	\
>  	.address = reg,	\
> @@ -225,12 +233,14 @@ static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
>  
>  static const struct i2c_device_id mc3230_i2c_id[] = {
>  	{ "mc3230", (kernel_ulong_t)&mc3230_chip_info },
> +	{ "mc3510c", (kernel_ulong_t)&mc3510c_chip_info },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
>  
>  static const struct of_device_id mc3230_of_match[] = {
>  	{ .compatible = "mcube,mc3230", &mc3230_chip_info },
> +	{ .compatible = "mcube,mc3510c", &mc3510c_chip_info },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, mc3230_of_match);
> 


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 3/5] iio: accel: mc3230: add OF match table
  2025-01-12 16:29   ` Jonathan Cameron
@ 2025-01-12 16:38     ` Vasiliy Doylov
  0 siblings, 0 replies; 14+ messages in thread
From: Vasiliy Doylov @ 2025-01-12 16:38 UTC (permalink / raw)
  To: Jonathan Cameron, Vasiliy Doylov via B4 Relay
  Cc: Lars-Peter Clausen, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley, linux-iio, linux-kernel, devicetree


On 1/12/25 7:29 PM, Jonathan Cameron wrote:
> Are you sure that didn't previously work?  I thought there were
> fallbacks that would make it use the driver name if nothing else matched.

It works if I modprobe module, but module doesn't loading automatically 
on boot like other modules.

With OF match it loads automatically during boot, without i need to call 
modprobe explicitly


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c
  2025-01-12 12:25 ` [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c Vasiliy Doylov via B4 Relay
@ 2025-01-13  8:49   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2025-01-13  8:49 UTC (permalink / raw)
  To: Vasiliy Doylov
  Cc: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, Jan 12, 2025 at 03:25:35PM +0300, Vasiliy Doylov wrote:
> The MC3510C is a 3 asix digital accelerometer.
> It handled by the same driver as MC3230.
> Document it as a trivial device.

How did you implement the comment about proper wrapping? Your style
makes it less readable than it should be, for no real gain.

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support
  2025-01-12 12:25 ` [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Vasiliy Doylov via B4 Relay
  2025-01-12 16:32   ` Jonathan Cameron
@ 2025-01-13  8:51   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2025-01-13  8:51 UTC (permalink / raw)
  To: Vasiliy Doylov
  Cc: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, Jan 12, 2025 at 03:25:38PM +0300, Vasiliy Doylov wrote:
> This patch allows to add new devices to this driver.
> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
> ---
>  drivers/iio/accel/mc3230.c | 50 ++++++++++++++++++++++++++++++++++------------
>  1 file changed, 37 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index ba30c904d3f67002deeb3ca5a7e12bfae312e05f..1b58f3ea50655b6563a78a2531b16a8088e8f8d5 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -22,20 +22,29 @@
>  #define MC3230_MODE_OPCON_STANDBY	0x03
>  
>  #define MC3230_REG_CHIP_ID		0x18
> -#define MC3230_CHIP_ID			0x01
> -
>  #define MC3230_REG_PRODUCT_CODE		0x3b
> -#define MC3230_PRODUCT_CODE		0x19
>  
>  /*
>   * The accelerometer has one measurement range:
>   *
>   * -1.5g - +1.5g (8-bit, signed)
>   *
> - * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1)	= 0.115411765
>   */
>  
> -static const int mc3230_nscale = 115411765;
> +struct mc3230_chip_info {
> +	const u8 chip_id;
> +	const char *name;
> +	const u8 product_code;
> +	const int scale;
> +};
> +
> +static struct mc3230_chip_info mc3230_chip_info = {

Why this cannot be const?

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support
  2025-01-12 12:25 ` [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support Vasiliy Doylov via B4 Relay
  2025-01-12 16:34   ` Jonathan Cameron
@ 2025-01-13  8:51   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2025-01-13  8:51 UTC (permalink / raw)
  To: Vasiliy Doylov
  Cc: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, linux-iio, linux-kernel,
	devicetree

On Sun, Jan 12, 2025 at 03:25:39PM +0300, Vasiliy Doylov wrote:
> This commit integrates support for the mc3510c into the mc3230 driver.
> 
> Tested on Huawei MediaPad T3 10 (huawei-agassi)
> 
> Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
> ---
>  drivers/iio/accel/mc3230.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
> index 1b58f3ea50655b6563a78a2531b16a8088e8f8d5..92934975edc77b11ed6dc3da077a28d317314fab 100644
> --- a/drivers/iio/accel/mc3230.c
> +++ b/drivers/iio/accel/mc3230.c
> @@ -46,6 +46,14 @@ static struct mc3230_chip_info mc3230_chip_info = {
>  	.scale = 115411765,
>  };
>  
> +static struct mc3230_chip_info mc3510c_chip_info = {

const

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2025-01-13  8:51 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-12 12:25 [PATCH v3 0/5] iio: accel: mc3230: add mount matrix, of match and mc3510c support Vasiliy Doylov via B4 Relay
2025-01-12 12:25 ` [PATCH v3 1/5] dt-bindings: iio: accel: mc3230: document mc3510c Vasiliy Doylov via B4 Relay
2025-01-13  8:49   ` Krzysztof Kozlowski
2025-01-12 12:25 ` [PATCH v3 2/5] iio: accel: mc3230: add mount matrix support Vasiliy Doylov via B4 Relay
2025-01-12 16:28   ` Jonathan Cameron
2025-01-12 12:25 ` [PATCH v3 3/5] iio: accel: mc3230: add OF match table Vasiliy Doylov via B4 Relay
2025-01-12 16:29   ` Jonathan Cameron
2025-01-12 16:38     ` Vasiliy Doylov
2025-01-12 12:25 ` [PATCH v3 4/5] iio: accel: mc3230: add multiple devices support Vasiliy Doylov via B4 Relay
2025-01-12 16:32   ` Jonathan Cameron
2025-01-13  8:51   ` Krzysztof Kozlowski
2025-01-12 12:25 ` [PATCH v3 5/5] iio: accel: mc3230: add mc3510c support Vasiliy Doylov via B4 Relay
2025-01-12 16:34   ` Jonathan Cameron
2025-01-13  8:51   ` Krzysztof Kozlowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox