On Tue, 13 Dec 2022 11:15:32 -0600
Han Xu <han.xu@xxxxxxx> wrote:
> From: Haibo Chen <haibo.chen@xxxxxxx>
>
> FXLS8974CF is similar with FXLS8962AF, the only difference is the
> device id change to 0x86.
>
> Signed-off-by: Haibo Chen <haibo.chen@xxxxxxx>
> Reviewed-by: Clark Wang <xiaoning.wang@xxxxxxx>
As per the discussion on bindings, we should establish
1) Is this driver going to support devices that have different channel descriptions
If not - rip that support out as it is misleading.
2) Drop the error return if we don't match IDs. Assume that it is infact yet another
compatible part and use whatever it was said to be compatible with.
If they are all compatible, just use the first element for this - things
get more complex if there are multiple sets of compatible parts.
either way, we should drop the driver_data in fxls8962af_id[] as it's not used
anyway and that will avoid the complexity of the dt binding discussion.
> ---
> drivers/iio/accel/fxls8962af-core.c | 7 +++++++
> drivers/iio/accel/fxls8962af-i2c.c | 2 ++
> drivers/iio/accel/fxls8962af.h | 1 +
> 3 files changed, 10 insertions(+)
>
> diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
> index 0d672b1469e8..98811e4e16bb 100644
> --- a/drivers/iio/accel/fxls8962af-core.c
> +++ b/drivers/iio/accel/fxls8962af-core.c
> @@ -126,6 +126,7 @@
>
> #define FXLS8962AF_DEVICE_ID 0x62
> #define FXLS8964AF_DEVICE_ID 0x84
> +#define FXLS8974CF_DEVICE_ID 0x86
>
> /* Raw temp channel offset */
> #define FXLS8962AF_TEMP_CENTER_VAL 25
> @@ -764,6 +765,12 @@ static const struct fxls8962af_chip_info fxls_chip_info_table[] = {
> .channels = fxls8962af_channels,
> .num_channels = ARRAY_SIZE(fxls8962af_channels),
> },
> + [fxls8974cf] = {
> + .chip_id = FXLS8974CF_DEVICE_ID,
> + .name = "fxls8974cf",
> + .channels = fxls8962af_channels,
> + .num_channels = ARRAY_SIZE(fxls8962af_channels),
> + },
> };
>
> static const struct iio_info fxls8962af_info = {
> diff --git a/drivers/iio/accel/fxls8962af-i2c.c b/drivers/iio/accel/fxls8962af-i2c.c
> index 22640eaebac7..17dd56756ff9 100644
> --- a/drivers/iio/accel/fxls8962af-i2c.c
> +++ b/drivers/iio/accel/fxls8962af-i2c.c
> @@ -30,6 +30,7 @@ static int fxls8962af_probe(struct i2c_client *client)
> static const struct i2c_device_id fxls8962af_id[] = {
> { "fxls8962af", fxls8962af },
> { "fxls8964af", fxls8964af },
> + { "fxls8974cf", fxls8974cf },
> {}
> };
> MODULE_DEVICE_TABLE(i2c, fxls8962af_id);
> @@ -37,6 +38,7 @@ MODULE_DEVICE_TABLE(i2c, fxls8962af_id);
> static const struct of_device_id fxls8962af_of_match[] = {
> { .compatible = "nxp,fxls8962af" },
> { .compatible = "nxp,fxls8964af" },
> + { .compatible = "nxp,fxls8974cf" },
> {}
> };
> MODULE_DEVICE_TABLE(of, fxls8962af_of_match);
> diff --git a/drivers/iio/accel/fxls8962af.h b/drivers/iio/accel/fxls8962af.h
> index 9cbe98c3ba9a..45c7e57412e0 100644
> --- a/drivers/iio/accel/fxls8962af.h
> +++ b/drivers/iio/accel/fxls8962af.h
> @@ -11,6 +11,7 @@ struct device;
> enum {
> fxls8962af,
> fxls8964af,
> + fxls8974cf,
> };
>
> int fxls8962af_core_probe(struct device *dev, struct regmap *regmap, int irq);
