On Mon, 11 Nov 2019 16:35:16 +0100
Andrea Merello <andrea.merello@xxxxxxxxx> wrote:
> We added a sysfs ABI for getting/setting the type of a thermocouple. This
> driver supports chips that support specific fixed thermocouple types; we
> cannot set it, but still we can add this sysfs attribute in RO mode to
> read-back the thermocouple type.
>
> This driver supports actually several chips:
> - max6675
> - max31855[k/j/n/s/t/e/r]asa family
>
> Max6675 supports only K-type thermocouples, so we can just report that.
>
> Each chip in max31855 family supports just one specific thermocouple type
> (in the obvious way: i.e. max31855jasa supports J-type). This driver did
> accept a generic SPI ID and OF compatible "max31855" which does not give
> any clue about which chip is really involved (and unfortunately it seems
> we have no way to detect it).
>
> This patch introduces a new set of, more specific, SPI IDs and OF
> compatible strings to better match the chip type.
>
> The old, generic, "max31855" binding is kept for compatibility reasons, but
> this patch aims to deprecate it, so, should we hit it, a warning is spit.
> In such case the reported thermocouple type in sysfs is '?', because we
> have no way to know.
>
> Regarding the implementation: the thermocouple type information is stored
> in the driver private data and I've kept only two maxim_thermocouple_chip
> types in order to avoid a lot of duplications (seven chip types with just
> a different thermocouple type).
>
> RFT because I have no real HW to test this.
Trivial comment inline.
Thanks,
J
>
> Cc: Hartmut Knaack <knaack.h@xxxxxx>
> Cc: Lars-Peter Clausen <lars@xxxxxxxxxx>
> Cc: Peter Meerwald-Stadler <pmeerw@xxxxxxxxxx>
> Cc: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> Cc: Patrick Havelange <patrick.havelange@xxxxxxxxxxxxx>
> Cc: Paresh Chaudhary <paresh.chaudhary@xxxxxxxxxxxxxxxxxxx>
> Cc: Matt Weber <matthew.weber@xxxxxxxxxxxxxxxxxxx>
> Cc: Matt Ranostay <matt.ranostay@xxxxxxxxxxxx>
> Cc: Chuhong Yuan <hslester96@xxxxxxxxx>
> Cc: Daniel Gomez <dagmcr@xxxxxxxxx>
> Cc: linux-iio@xxxxxxxxxxxxxxx
> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Signed-off-by: Andrea Merello <andrea.merello@xxxxxxxxx>
> ---
> drivers/iio/temperature/maxim_thermocouple.c | 45 ++++++++++++++++++--
> 1 file changed, 41 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
> index d1360605209c..6fa5ae9fb4ec 100644
> --- a/drivers/iio/temperature/maxim_thermocouple.c
> +++ b/drivers/iio/temperature/maxim_thermocouple.c
> @@ -14,6 +14,7 @@
> #include <linux/of_device.h>
> #include <linux/spi/spi.h>
> #include <linux/iio/iio.h>
> +#include <linux/iio/sysfs.h>
> #include <linux/iio/trigger.h>
> #include <linux/iio/buffer.h>
> #include <linux/iio/triggered_buffer.h>
> @@ -24,13 +25,25 @@
> enum {
> MAX6675,
> MAX31855,
> + MAX31855K,
> + MAX31855J,
> + MAX31855N,
> + MAX31855S,
> + MAX31855T,
> + MAX31855E,
> + MAX31855R,
> +};
> +
> +const char maxim_tc_types[] = {
> + 'K', '?', 'K', 'J', 'N', 'S', 'T', 'E', 'R'
> };
>
> static const struct iio_chan_spec max6675_channels[] = {
> { /* thermocouple temperature */
> .type = IIO_TEMP,
> .info_mask_separate =
> - BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) |
> + BIT(IIO_CHAN_INFO_THERMOCOUPLE_TYPE),
> .scan_index = 0,
> .scan_type = {
> .sign = 's',
> @@ -48,7 +61,8 @@ static const struct iio_chan_spec max31855_channels[] = {
> .type = IIO_TEMP,
> .address = 2,
> .info_mask_separate =
> - BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) |
> + BIT(IIO_CHAN_INFO_THERMOCOUPLE_TYPE),
> .scan_index = 0,
> .scan_type = {
> .sign = 's',
> @@ -110,6 +124,7 @@ struct maxim_thermocouple_data {
> const struct maxim_thermocouple_chip *chip;
>
> u8 buffer[16] ____cacheline_aligned;
> + char tc_type;
> };
>
> static int maxim_thermocouple_read(struct maxim_thermocouple_data *data,
> @@ -196,8 +211,11 @@ static int maxim_thermocouple_read_raw(struct iio_dev *indio_dev,
> ret = IIO_VAL_INT;
> }
> break;
> + case IIO_CHAN_INFO_THERMOCOUPLE_TYPE:
> + *val = data->tc_type;
> + ret = IIO_VAL_CHAR;
> + break;
> }
> -
Another stray whitespace change.
> return ret;
> }
>
> @@ -210,8 +228,9 @@ static int maxim_thermocouple_probe(struct spi_device *spi)
> const struct spi_device_id *id = spi_get_device_id(spi);
> struct iio_dev *indio_dev;
> struct maxim_thermocouple_data *data;
> + const int chip_type = (id->driver_data == MAX6675) ? MAX6675 : MAX31855;
> const struct maxim_thermocouple_chip *chip =
> - &maxim_thermocouple_chips[id->driver_data];
> + &maxim_thermocouple_chips[chip_type];
> int ret;
>
> indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*data));
> @@ -229,6 +248,7 @@ static int maxim_thermocouple_probe(struct spi_device *spi)
> data = iio_priv(indio_dev);
> data->spi = spi;
> data->chip = chip;
> + data->tc_type = maxim_tc_types[id->driver_data];
>
> ret = devm_iio_triggered_buffer_setup(&spi->dev,
> indio_dev, NULL,
> @@ -236,12 +256,22 @@ static int maxim_thermocouple_probe(struct spi_device *spi)
> if (ret)
> return ret;
>
> + if (id->driver_data == MAX31855)
> + dev_warn(&spi->dev, "generic max31855 ID is deprecated\nplease use more specific part type");
> +
> return devm_iio_device_register(&spi->dev, indio_dev);
> }
>
> static const struct spi_device_id maxim_thermocouple_id[] = {
> {"max6675", MAX6675},
> {"max31855", MAX31855},
> + {"max31855k", MAX31855K},
> + {"max31855j", MAX31855J},
> + {"max31855n", MAX31855N},
> + {"max31855s", MAX31855S},
> + {"max31855t", MAX31855T},
> + {"max31855e", MAX31855E},
> + {"max31855r", MAX31855R},
> {},
> };
> MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
> @@ -249,6 +279,13 @@ MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
> static const struct of_device_id maxim_thermocouple_of_match[] = {
> { .compatible = "maxim,max6675" },
> { .compatible = "maxim,max31855" },
> + { .compatible = "maxim,max31855k" },
> + { .compatible = "maxim,max31855j" },
> + { .compatible = "maxim,max31855n" },
> + { .compatible = "maxim,max31855s" },
> + { .compatible = "maxim,max31855t" },
> + { .compatible = "maxim,max31855e" },
> + { .compatible = "maxim,max31855r" },
> { },
> };
> MODULE_DEVICE_TABLE(of, maxim_thermocouple_of_match);
