diff mbox series

[v2,4/9] iio: accel: bmc150: Sort all chip names alphabetically / by chip ID

Message ID 20210610122126.50504-5-stephan@gerhold.net (mailing list archive)
State Superseded
Headers show
Series iio: accel: bmc150: Add support for BMA253/BMA254 | expand

Commit Message

Stephan Gerhold June 10, 2021, 12:21 p.m. UTC 
Right now all the device IDs are listed in seemingly random order,
make this consistent by ordering those alphabetically. Also, order
bmc150_accel_chip_info_tbl by chip ID for the same reason.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
New patch in v2.
---
 drivers/iio/accel/Kconfig             |  4 +--
 drivers/iio/accel/bmc150-accel-core.c | 40 +++++++++++++--------------
 drivers/iio/accel/bmc150-accel-i2c.c  | 26 ++++++++---------
 drivers/iio/accel/bmc150-accel-spi.c  | 18 ++++++------
 4 files changed, 44 insertions(+), 44 deletions(-)

Comments

Andy Shevchenko June 10, 2021, 12:50 p.m. UTC | #1 
On Thu, Jun 10, 2021 at 3:24 PM Stephan Gerhold <stephan@gerhold.net> wrote:
>
> Right now all the device IDs are listed in seemingly random order,
> make this consistent by ordering those alphabetically. Also, order
> bmc150_accel_chip_info_tbl by chip ID for the same reason.

Thanks!
My comments below, after addressing them,
Reviewed-by: Andy Shevchenko <andy.shevhcenko@gmail.com>

...

>         select BMC150_ACCEL_SPI if SPI
>         help
>           Say yes here to build support for the following Bosch accelerometers:
> -         BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
> +         BMA222, BMA222E, BMA250E, BMA255, BMA280, BMC150, BMI055.

Thanks!

> -         This is a combo module with both accelerometer and magnetometer.

> +         BMC150 is a combo module with both accelerometer and magnetometer.

BMC150 is only one from the list. Previous message applies to all
listed components, so is this not true anymore for the rest?
Or all the rest is not a combo? Please, clarify that in the commit
message, or if this is a wrong change, drop it.

>           This driver is only implementing accelerometer part, which has
>           its own address and register map.
Stephan Gerhold June 10, 2021, 1 p.m. UTC | #2 
On Thu, Jun 10, 2021 at 03:50:25PM +0300, Andy Shevchenko wrote:
> On Thu, Jun 10, 2021 at 3:24 PM Stephan Gerhold <stephan@gerhold.net> wrote:
> >
> > Right now all the device IDs are listed in seemingly random order,
> > make this consistent by ordering those alphabetically. Also, order
> > bmc150_accel_chip_info_tbl by chip ID for the same reason.
> 
> Thanks!
> My comments below, after addressing them,
> Reviewed-by: Andy Shevchenko <andy.shevhcenko@gmail.com>
> 
> ...
> 
> >         select BMC150_ACCEL_SPI if SPI
> >         help
> >           Say yes here to build support for the following Bosch accelerometers:
> > -         BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
> > +         BMA222, BMA222E, BMA250E, BMA255, BMA280, BMC150, BMI055.
> 
> Thanks!
> 
> > -         This is a combo module with both accelerometer and magnetometer.
> 
> > +         BMC150 is a combo module with both accelerometer and magnetometer.
> 
> BMC150 is only one from the list. Previous message applies to all
> listed components, so is this not true anymore for the rest?
> Or all the rest is not a combo? Please, clarify that in the commit
> message, or if this is a wrong change, drop it.
> 

I stumbled on that sentence when making the changes and it definitely
does not apply to the BMA* variants. Those are accelerometer only.

As far I can tell the prefix in the chip name says which kind of sensors
are included, i.e.

  - BMC150: accelerometer + magnetometer
  - BMA*:   only accelerometer

I'm not familiar with BMI055 but funnily the datasheet suggests it's

  - BMI055: accelerometer + gyroscope

So for BMI055 the previous message is wrong too. I guess I need to do
yet another commit in v3 to make the Kconfig option more clear for all
the sensor variants. :)

Thanks!
Stephan
diff mbox series

Patch

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 17f6bdcf1db3..883aa8bc4340 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -143,9 +143,9 @@  config BMC150_ACCEL
 	select BMC150_ACCEL_SPI if SPI
 	help
 	  Say yes here to build support for the following Bosch accelerometers:
-	  BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
+	  BMA222, BMA222E, BMA250E, BMA255, BMA280, BMC150, BMI055.
 
-	  This is a combo module with both accelerometer and magnetometer.
+	  BMC150 is a combo module with both accelerometer and magnetometer.
 	  This driver is only implementing accelerometer part, which has
 	  its own address and register map.
 
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 6fb025b4228f..1210a8b14a3c 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -1089,26 +1089,6 @@  static const struct iio_chan_spec bma280_accel_channels[] =
 	BMC150_ACCEL_CHANNELS(14);
 
 static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
-	{
-		.name = "BMC150/BMI055/BMA255",
-		.chip_id = 0xFA,
-		.channels = bmc150_accel_channels,
-		.num_channels = ARRAY_SIZE(bmc150_accel_channels),
-		.scale_table = { {9610, BMC150_ACCEL_DEF_RANGE_2G},
-				 {19122, BMC150_ACCEL_DEF_RANGE_4G},
-				 {38344, BMC150_ACCEL_DEF_RANGE_8G},
-				 {76590, BMC150_ACCEL_DEF_RANGE_16G} },
-	},
-	{
-		.name = "BMA250E",
-		.chip_id = 0xF9,
-		.channels = bma250e_accel_channels,
-		.num_channels = ARRAY_SIZE(bma250e_accel_channels),
-		.scale_table = { {38344, BMC150_ACCEL_DEF_RANGE_2G},
-				 {76590, BMC150_ACCEL_DEF_RANGE_4G},
-				 {153277, BMC150_ACCEL_DEF_RANGE_8G},
-				 {306457, BMC150_ACCEL_DEF_RANGE_16G} },
-	},
 	{
 		.name = "BMA222",
 		.chip_id = 0x03,
@@ -1134,6 +1114,26 @@  static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
 				 {612915, BMC150_ACCEL_DEF_RANGE_8G},
 				 {1225831, BMC150_ACCEL_DEF_RANGE_16G} },
 	},
+	{
+		.name = "BMA250E",
+		.chip_id = 0xF9,
+		.channels = bma250e_accel_channels,
+		.num_channels = ARRAY_SIZE(bma250e_accel_channels),
+		.scale_table = { {38344, BMC150_ACCEL_DEF_RANGE_2G},
+				 {76590, BMC150_ACCEL_DEF_RANGE_4G},
+				 {153277, BMC150_ACCEL_DEF_RANGE_8G},
+				 {306457, BMC150_ACCEL_DEF_RANGE_16G} },
+	},
+	{
+		.name = "BMC150/BMI055/BMA255",
+		.chip_id = 0xFA,
+		.channels = bmc150_accel_channels,
+		.num_channels = ARRAY_SIZE(bmc150_accel_channels),
+		.scale_table = { {9610, BMC150_ACCEL_DEF_RANGE_2G},
+				 {19122, BMC150_ACCEL_DEF_RANGE_4G},
+				 {38344, BMC150_ACCEL_DEF_RANGE_8G},
+				 {76590, BMC150_ACCEL_DEF_RANGE_16G} },
+	},
 	{
 		.name = "BMA280",
 		.chip_id = 0xFB,
diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
index a0e2782580b7..7db436ddbdce 100644
--- a/drivers/iio/accel/bmc150-accel-i2c.c
+++ b/drivers/iio/accel/bmc150-accel-i2c.c
@@ -213,41 +213,41 @@  static int bmc150_accel_remove(struct i2c_client *client)
 }
 
 static const struct acpi_device_id bmc150_accel_acpi_match[] = {
-	{"BSBA0150"},
-	{"BMC150A"},
-	{"BMI055A"},
 	{"BMA0255"},
-	{"BMA250E"},
+	{"BMA0280"},
 	{"BMA222"},
 	{"BMA222E"},
-	{"BMA0280"},
+	{"BMA250E"},
+	{"BMC150A"},
+	{"BMI055A"},
 	{"BOSC0200"},
+	{"BSBA0150"},
 	{"DUAL250E"},
 	{ },
 };
 MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
 
 static const struct i2c_device_id bmc150_accel_id[] = {
-	{"bmc150_accel"},
-	{"bmi055_accel"},
-	{"bma255"},
-	{"bma250e"},
 	{"bma222"},
 	{"bma222e"},
+	{"bma250e"},
+	{"bma255"},
 	{"bma280"},
+	{"bmc150_accel"},
+	{"bmi055_accel"},
 	{}
 };
 
 MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
 
 static const struct of_device_id bmc150_accel_of_match[] = {
-	{ .compatible = "bosch,bmc150_accel" },
-	{ .compatible = "bosch,bmi055_accel" },
-	{ .compatible = "bosch,bma255" },
-	{ .compatible = "bosch,bma250e" },
 	{ .compatible = "bosch,bma222" },
 	{ .compatible = "bosch,bma222e" },
+	{ .compatible = "bosch,bma250e" },
+	{ .compatible = "bosch,bma255" },
 	{ .compatible = "bosch,bma280" },
+	{ .compatible = "bosch,bmc150_accel" },
+	{ .compatible = "bosch,bmi055_accel" },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, bmc150_accel_of_match);
diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c
index 01b42fa6a015..dc884fa18ad0 100644
--- a/drivers/iio/accel/bmc150-accel-spi.c
+++ b/drivers/iio/accel/bmc150-accel-spi.c
@@ -34,26 +34,26 @@  static int bmc150_accel_remove(struct spi_device *spi)
 }
 
 static const struct acpi_device_id bmc150_accel_acpi_match[] = {
-	{"BSBA0150"},
-	{"BMC150A"},
-	{"BMI055A"},
 	{"BMA0255"},
-	{"BMA250E"},
+	{"BMA0280"},
 	{"BMA222"},
 	{"BMA222E"},
-	{"BMA0280"},
+	{"BMA250E"},
+	{"BMC150A"},
+	{"BMI055A"},
+	{"BSBA0150"},
 	{ },
 };
 MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
 
 static const struct spi_device_id bmc150_accel_id[] = {
-	{"bmc150_accel"},
-	{"bmi055_accel"},
-	{"bma255"},
-	{"bma250e"},
 	{"bma222"},
 	{"bma222e"},
+	{"bma250e"},
+	{"bma255"},
 	{"bma280"},
+	{"bmc150_accel"},
+	{"bmi055_accel"},
 	{}
 };
 MODULE_DEVICE_TABLE(spi, bmc150_accel_id);