lkml.org 
[lkml]   [2020]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] iio:pressure:ms5637: introduce hardware differentiation
    Date
    Some sensors in the ms58xx family have a different PROM length and a
    different number of available resolution. introduce struct ms_tp_hw_data to
    handle those differences.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    ---
    .../iio/common/ms_sensors/ms_sensors_i2c.h | 11 ++++++
    drivers/iio/pressure/ms5637.c | 35 +++++++++++++++----
    2 files changed, 40 insertions(+), 6 deletions(-)

    diff --git a/drivers/iio/common/ms_sensors/ms_sensors_i2c.h b/drivers/iio/common/ms_sensors/ms_sensors_i2c.h
    index bad09c80e47a..f4a88148c113 100644
    --- a/drivers/iio/common/ms_sensors/ms_sensors_i2c.h
    +++ b/drivers/iio/common/ms_sensors/ms_sensors_i2c.h
    @@ -25,6 +25,16 @@ struct ms_ht_dev {
    u8 res_index;
    };

    +/**
    + * struct ms_hw_data - Temperature/Pressure sensor hardware data
    + * @prom_len: number of words in the PROM
    + * @max_res_index: maximum sensor resolution index
    + */
    +struct ms_tp_hw_data {
    + u8 prom_len;
    + u8 max_res_index;
    +};
    +
    /**
    * struct ms_tp_dev - Temperature/Pressure sensor device structure
    * @client: i2c client
    @@ -36,6 +46,7 @@ struct ms_ht_dev {
    struct ms_tp_dev {
    struct i2c_client *client;
    struct mutex lock;
    + const struct ms_tp_hw_data *hw;
    u16 prom[MS_SENSORS_TP_PROM_WORDS_NB + 1];
    u8 res_index;
    };
    diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
    index 7c3f0ccd917c..351bfdb24fb4 100644
    --- a/drivers/iio/pressure/ms5637.c
    +++ b/drivers/iio/pressure/ms5637.c
    @@ -30,6 +30,11 @@

    #include "../common/ms_sensors/ms_sensors_i2c.h"

    +struct ms_tp_data {
    + const char *name;
    + const struct ms_tp_hw_data *hw;
    +};
    +
    static const int ms5637_samp_freq[6] = { 960, 480, 240, 120, 60, 30 };
    /* String copy of the above const for readability purpose */
    static const char ms5637_show_samp_freq[] = "960 480 240 120 60 30";
    @@ -128,6 +133,7 @@ static const struct iio_info ms5637_info = {

    static int ms5637_probe(struct i2c_client *client)
    {
    + const struct ms_tp_data *data = device_get_match_data(&client->dev);
    struct ms_tp_dev *dev_data;
    struct iio_dev *indio_dev;
    int ret;
    @@ -147,11 +153,12 @@ static int ms5637_probe(struct i2c_client *client)

    dev_data = iio_priv(indio_dev);
    dev_data->client = client;
    - dev_data->res_index = 5;
    + dev_data->res_index = data->hw->max_res_index;
    + dev_data->hw = data->hw;
    mutex_init(&dev_data->lock);

    indio_dev->info = &ms5637_info;
    - indio_dev->name = device_get_match_data(&client->dev);
    + indio_dev->name = data->name;
    indio_dev->modes = INDIO_DIRECT_MODE;
    indio_dev->channels = ms5637_channels;
    indio_dev->num_channels = ARRAY_SIZE(ms5637_channels);
    @@ -169,11 +176,27 @@ static int ms5637_probe(struct i2c_client *client)
    return devm_iio_device_register(&client->dev, indio_dev);
    }

    +static const struct ms_tp_hw_data ms5637_hw_data = {
    + .prom_len = 7,
    + .max_res_index = 5
    +};
    +
    +static const struct ms_tp_data ms5637_data = { .name = "ms5637", .hw = &ms5637_hw_data };
    +
    +static const struct ms_tp_data ms5805_data = { .name = "ms5805", .hw = &ms5637_hw_data };
    +
    +static const struct ms_tp_data ms5837_data = { .name = "ms5837", .hw = &ms5637_hw_data };
    +
    +static const struct ms_tp_data ms8607_data = {
    + .name = "ms8607-temppressure",
    + .hw = &ms5637_hw_data,
    +};
    +
    static const struct of_device_id ms5637_of_match[] = {
    - { .compatible = "meas,ms5637", .data = "ms5637" },
    - { .compatible = "meas,ms5805", .data = "ms5805" },
    - { .compatible = "meas,ms5837", .data = "ms5837" },
    - { .compatible = "meas,ms8607-temppressure", .data = "ms8607-temppressure" },
    + { .compatible = "meas,ms5637", .data = &ms5637_data },
    + { .compatible = "meas,ms5805", .data = &ms5805_data },
    + { .compatible = "meas,ms5837", .data = &ms5837_data },
    + { .compatible = "meas,ms8607-temppressure", .data = &ms8607_data },
    { },
    };
    MODULE_DEVICE_TABLE(of, ms5637_of_match);
    --
    2.28.0
    \
     
     \ /
      Last update: 2020-12-10 00:52    [W:7.722 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site