admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

iio: accel: bmc150: Sort all chip names alphabetically / by chip ID

Browse Source 
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>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20210611080903.14384-6-stephan@gerhold.net
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Stephan Gerhold
2021-06-11 10:08:58 +02:00
committed by Jonathan Cameron
parent 54b61203e2
commit 88e63ce6ca
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/iio/accel/bmc150-accel-core.c
View File

@@ -1089,26 +1089,6 @@ static const struct iio_chan_spec bma280_accel_channels[] =
BMC150_ACCEL_CHANNELS(14); BMC150_ACCEL_CHANNELS(14);
static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = { static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
{
.name = "BMA255/BMC150/BMI055",
.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", .name = "BMA222",
.chip_id = 0x03, .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}, {612915, BMC150_ACCEL_DEF_RANGE_8G},
{1225831, BMC150_ACCEL_DEF_RANGE_16G} }, {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 = "BMA255/BMC150/BMI055",
.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", .name = "BMA280",
.chip_id = 0xFB, .chip_id = 0xFB,

26
drivers/iio/accel/bmc150-accel-i2c.c
View File

@@ -213,41 +213,41 @@ static int bmc150_accel_remove(struct i2c_client *client)
} }
static const struct acpi_device_id bmc150_accel_acpi_match[] = { static const struct acpi_device_id bmc150_accel_acpi_match[] = {
{"BSBA0150"},
{"BMC150A"},
{"BMI055A"},
{"BMA0255"}, {"BMA0255"},
{"BMA250E"}, {"BMA0280"},
{"BMA222"}, {"BMA222"},
{"BMA222E"}, {"BMA222E"},
{"BMA0280"}, {"BMA250E"},
{"BMC150A"},
{"BMI055A"},
{"BOSC0200"}, {"BOSC0200"},
{"BSBA0150"},
{"DUAL250E"}, {"DUAL250E"},
{ }, { },
}; };
MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match); MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
static const struct i2c_device_id bmc150_accel_id[] = { static const struct i2c_device_id bmc150_accel_id[] = {
{"bmc150_accel"},
{"bmi055_accel"},
{"bma255"},
{"bma250e"},
{"bma222"}, {"bma222"},
{"bma222e"}, {"bma222e"},
{"bma250e"},
{"bma255"},
{"bma280"}, {"bma280"},
{"bmc150_accel"},
{"bmi055_accel"},
{} {}
}; };
MODULE_DEVICE_TABLE(i2c, bmc150_accel_id); MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
static const struct of_device_id bmc150_accel_of_match[] = { 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,bma222" },
{ .compatible = "bosch,bma222e" }, { .compatible = "bosch,bma222e" },
{ .compatible = "bosch,bma250e" },
{ .compatible = "bosch,bma255" },
{ .compatible = "bosch,bma280" }, { .compatible = "bosch,bma280" },
{ .compatible = "bosch,bmc150_accel" },
{ .compatible = "bosch,bmi055_accel" },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, bmc150_accel_of_match); MODULE_DEVICE_TABLE(of, bmc150_accel_of_match);

18
drivers/iio/accel/bmc150-accel-spi.c
View File

@@ -34,26 +34,26 @@ static int bmc150_accel_remove(struct spi_device *spi)
} }
static const struct acpi_device_id bmc150_accel_acpi_match[] = { static const struct acpi_device_id bmc150_accel_acpi_match[] = {
{"BSBA0150"},
{"BMC150A"},
{"BMI055A"},
{"BMA0255"}, {"BMA0255"},
{"BMA250E"}, {"BMA0280"},
{"BMA222"}, {"BMA222"},
{"BMA222E"}, {"BMA222E"},
{"BMA0280"}, {"BMA250E"},
{"BMC150A"},
{"BMI055A"},
{"BSBA0150"},
{ }, { },
}; };
MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match); MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
static const struct spi_device_id bmc150_accel_id[] = { static const struct spi_device_id bmc150_accel_id[] = {
{"bmc150_accel"},
{"bmi055_accel"},
{"bma255"},
{"bma250e"},
{"bma222"}, {"bma222"},
{"bma222e"}, {"bma222e"},
{"bma250e"},
{"bma255"},
{"bma280"}, {"bma280"},
{"bmc150_accel"},
{"bmi055_accel"},
{} {}
}; };
MODULE_DEVICE_TABLE(spi, bmc150_accel_id); MODULE_DEVICE_TABLE(spi, bmc150_accel_id);