| Message ID | 20200813075125.4949-6-cmo@melexis.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: temperature: mlx90632: Add extended calibration calculations | expand |
On Thu, Aug 13, 2020 at 10:53 AM Crt Mori <cmo@melexis.com> wrote: > > There is some inconsistency and whitespace cleanup performed in this > patch. It was done on top of my other patches, but I can rebase to head > of the togreg branch if it would go in sooner. ... > -#define MLX90632_REF_12 12LL /**< ResCtrlRef value of Ch 1 or Ch 2 */ > -#define MLX90632_REF_3 12LL /**< ResCtrlRef value of Channel 3 */ > -#define MLX90632_MAX_MEAS_NUM 31 /**< Maximum measurements in list */ > -#define MLX90632_SLEEP_DELAY_MS 3000 /**< Autosleep delay */ > +#define MLX90632_REF_12 12LL /* ResCtrlRef value of Ch 1 or Ch 2 */ > +#define MLX90632_REF_3 12LL /* ResCtrlRef value of Channel 3 */ > +#define MLX90632_MAX_MEAS_NUM 31 /* Maximum measurements in list */ > +#define MLX90632_SLEEP_DELAY_MS 3000 /* Autosleep delay */ > #define MLX90632_EXTENDED_LIMIT 27000 /* Extended mode raw value limit */ This was actually in doxy (perhaps kernel doc also understands this) format of description. Can you double check that the kernel doc is okay / not okay with it? If it is okay, perhaps it's better to convert others to that format rather than dropping it.
On Thu, 13 Aug 2020 at 13:01, Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Thu, Aug 13, 2020 at 10:53 AM Crt Mori <cmo@melexis.com> wrote: > > > > There is some inconsistency and whitespace cleanup performed in this > > patch. It was done on top of my other patches, but I can rebase to head > > of the togreg branch if it would go in sooner. > > ... > > > -#define MLX90632_REF_12 12LL /**< ResCtrlRef value of Ch 1 or Ch 2 */ > > -#define MLX90632_REF_3 12LL /**< ResCtrlRef value of Channel 3 */ > > -#define MLX90632_MAX_MEAS_NUM 31 /**< Maximum measurements in list */ > > -#define MLX90632_SLEEP_DELAY_MS 3000 /**< Autosleep delay */ > > > > +#define MLX90632_REF_12 12LL /* ResCtrlRef value of Ch 1 or Ch 2 */ > > +#define MLX90632_REF_3 12LL /* ResCtrlRef value of Channel 3 */ > > +#define MLX90632_MAX_MEAS_NUM 31 /* Maximum measurements in list */ > > +#define MLX90632_SLEEP_DELAY_MS 3000 /* Autosleep delay */ > > #define MLX90632_EXTENDED_LIMIT 27000 /* Extended mode raw value limit */ > > This was actually in doxy (perhaps kernel doc also understands this) > format of description. > Can you double check that the kernel doc is okay / not okay with it? > > If it is okay, perhaps it's better to convert others to that format > rather than dropping it. > It is indeed from doxygen and looking at other drivers it should not be OK. I checked the docs and it does not say in fact. Maybe Jonathan knows, but he was already OK with these changes in v1. > -- > With Best Regards, > Andy Shevchenko
On Thu, Aug 13, 2020 at 4:12 PM Crt Mori <cmo@melexis.com> wrote: > On Thu, 13 Aug 2020 at 13:01, Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Thu, Aug 13, 2020 at 10:53 AM Crt Mori <cmo@melexis.com> wrote: ... > > > -#define MLX90632_REF_12 12LL /**< ResCtrlRef value of Ch 1 or Ch 2 */ > > > -#define MLX90632_REF_3 12LL /**< ResCtrlRef value of Channel 3 */ > > > -#define MLX90632_MAX_MEAS_NUM 31 /**< Maximum measurements in list */ > > > -#define MLX90632_SLEEP_DELAY_MS 3000 /**< Autosleep delay */ > > > +#define MLX90632_REF_12 12LL /* ResCtrlRef value of Ch 1 or Ch 2 */ > > > +#define MLX90632_REF_3 12LL /* ResCtrlRef value of Channel 3 */ > > > +#define MLX90632_MAX_MEAS_NUM 31 /* Maximum measurements in list */ > > > +#define MLX90632_SLEEP_DELAY_MS 3000 /* Autosleep delay */ > > > #define MLX90632_EXTENDED_LIMIT 27000 /* Extended mode raw value limit */ > > > > This was actually in doxy (perhaps kernel doc also understands this) > > format of description. > > Can you double check that the kernel doc is okay / not okay with it? > > > > If it is okay, perhaps it's better to convert others to that format > > rather than dropping it. > > > It is indeed from doxygen and looking at other drivers it should not > be OK. I checked the docs and it does not say in fact. Maybe Jonathan > knows, but he was already OK with these changes in v1. I'm fine with either choice.
On Thu, 13 Aug 2020 22:41:51 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Thu, Aug 13, 2020 at 4:12 PM Crt Mori <cmo@melexis.com> wrote: > > On Thu, 13 Aug 2020 at 13:01, Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > > On Thu, Aug 13, 2020 at 10:53 AM Crt Mori <cmo@melexis.com> wrote: > > ... > > > > > -#define MLX90632_REF_12 12LL /**< ResCtrlRef value of Ch 1 or Ch 2 */ > > > > -#define MLX90632_REF_3 12LL /**< ResCtrlRef value of Channel 3 */ > > > > -#define MLX90632_MAX_MEAS_NUM 31 /**< Maximum measurements in list */ > > > > -#define MLX90632_SLEEP_DELAY_MS 3000 /**< Autosleep delay */ > > > > > +#define MLX90632_REF_12 12LL /* ResCtrlRef value of Ch 1 or Ch 2 */ > > > > +#define MLX90632_REF_3 12LL /* ResCtrlRef value of Channel 3 */ > > > > +#define MLX90632_MAX_MEAS_NUM 31 /* Maximum measurements in list */ > > > > +#define MLX90632_SLEEP_DELAY_MS 3000 /* Autosleep delay */ > > > > #define MLX90632_EXTENDED_LIMIT 27000 /* Extended mode raw value limit */ > > > > > > This was actually in doxy (perhaps kernel doc also understands this) > > > format of description. > > > Can you double check that the kernel doc is okay / not okay with it? > > > > > > If it is okay, perhaps it's better to convert others to that format > > > rather than dropping it. > > > > > It is indeed from doxygen and looking at other drivers it should not > > be OK. I checked the docs and it does not say in fact. Maybe Jonathan > > knows, but he was already OK with these changes in v1. > > I'm fine with either choice. > I'd prefer to get rid of them as you have done. Jonathan
diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperature/mlx90632.c index 9fa8c078c037..4ef13509fb0f 100644 --- a/drivers/iio/temperature/mlx90632.c +++ b/drivers/iio/temperature/mlx90632.c @@ -94,6 +94,9 @@ #define MLX90632_RAM_3(meas_num) (MLX90632_ADDR_RAM + 3 * meas_num + 2) /* Name important RAM_MEAS channels */ +#define MLX90632_RAM_DSP5_AMBIENT_1 MLX90632_RAM_3(1) +#define MLX90632_RAM_DSP5_AMBIENT_2 MLX90632_RAM_3(2) + #define MLX90632_RAM_DSP5_EXTENDED_AMBIENT_1 MLX90632_RAM_3(17) #define MLX90632_RAM_DSP5_EXTENDED_AMBIENT_2 MLX90632_RAM_3(18) #define MLX90632_RAM_DSP5_EXTENDED_OBJECT_1 MLX90632_RAM_1(17) @@ -111,10 +114,10 @@ #define MLX90632_DSP_VERSION 5 /* DSP version */ #define MLX90632_DSP_MASK GENMASK(7, 0) /* DSP version in EE_VERSION */ #define MLX90632_RESET_CMD 0x0006 /* Reset sensor (address or global) */ -#define MLX90632_REF_12 12LL /**< ResCtrlRef value of Ch 1 or Ch 2 */ -#define MLX90632_REF_3 12LL /**< ResCtrlRef value of Channel 3 */ -#define MLX90632_MAX_MEAS_NUM 31 /**< Maximum measurements in list */ -#define MLX90632_SLEEP_DELAY_MS 3000 /**< Autosleep delay */ +#define MLX90632_REF_12 12LL /* ResCtrlRef value of Ch 1 or Ch 2 */ +#define MLX90632_REF_3 12LL /* ResCtrlRef value of Channel 3 */ +#define MLX90632_MAX_MEAS_NUM 31 /* Maximum measurements in list */ +#define MLX90632_SLEEP_DELAY_MS 3000 /* Autosleep delay */ #define MLX90632_EXTENDED_LIMIT 27000 /* Extended mode raw value limit */ /** @@ -285,12 +288,12 @@ static int mlx90632_read_ambient_raw(struct regmap *regmap, int ret; unsigned int read_tmp; - ret = regmap_read(regmap, MLX90632_RAM_3(1), &read_tmp); + ret = regmap_read(regmap, MLX90632_RAM_DSP5_AMBIENT_1, &read_tmp); if (ret < 0) return ret; *ambient_new_raw = (s16)read_tmp; - ret = regmap_read(regmap, MLX90632_RAM_3(2), &read_tmp); + ret = regmap_read(regmap, MLX90632_RAM_DSP5_AMBIENT_2, &read_tmp); if (ret < 0) return ret; *ambient_old_raw = (s16)read_tmp; @@ -488,11 +491,11 @@ static s64 mlx90632_preprocess_temp_amb(s16 ambient_new_raw, kGb = ((s64)Gb * 1000LL) >> 10ULL; VR_Ta = (s64)ambient_old_raw * 1000000LL + - kGb * div64_s64(((s64)ambient_new_raw * 1000LL), - (MLX90632_REF_3)); + kGb * div64_s64((s64)ambient_new_raw * 1000LL, + MLX90632_REF_3); tmp = div64_s64( - div64_s64(((s64)ambient_new_raw * 1000000000000LL), - (MLX90632_REF_3)), VR_Ta); + div64_s64((s64)ambient_new_raw * 1000000000000LL, + MLX90632_REF_3), VR_Ta); return div64_s64(tmp << 19ULL, 1000LL); } @@ -504,13 +507,13 @@ static s64 mlx90632_preprocess_temp_obj(s16 object_new_raw, s16 object_old_raw, kKa = ((s64)Ka * 1000LL) >> 10ULL; VR_IR = (s64)ambient_old_raw * 1000000LL + - kKa * div64_s64(((s64)ambient_new_raw * 1000LL), - (MLX90632_REF_3)); + kKa * div64_s64((s64)ambient_new_raw * 1000LL, + MLX90632_REF_3); tmp = div64_s64( - div64_s64(((s64)((object_new_raw + object_old_raw) / 2) - * 1000000000000LL), (MLX90632_REF_12)), + div64_s64((s64)((object_new_raw + object_old_raw) / 2) + * 1000000000000LL, MLX90632_REF_12), VR_IR); - return div64_s64((tmp << 19ULL), 1000LL); + return div64_s64(tmp << 19ULL, 1000LL); } static s64 mlx90632_preprocess_temp_obj_extended(s16 object_new_raw, s16 ambient_new_raw, @@ -560,8 +563,8 @@ static s32 mlx90632_calc_temp_object_iteration(s32 prev_object_temp, s64 object, calcedKsTO = ((s64)((s64)Ga * (prev_object_temp - 25 * 1000LL) * 1000LL)) >> 36LL; calcedKsTA = ((s64)(Fb * (TAdut - 25 * 1000000LL))) >> 36LL; - Alpha_corr = div64_s64((((s64)(Fa * 10000000000LL) >> 46LL) - * Ha_customer), 1000LL); + Alpha_corr = div64_s64(((s64)(Fa * 10000000000LL) >> 46LL) + * Ha_customer, 1000LL); Alpha_corr *= ((s64)(1 * 1000000LL + calcedKsTO + calcedKsTA)); Alpha_corr = emissivity * div64_s64(Alpha_corr, 100000LL); Alpha_corr = div64_s64(Alpha_corr, 1000LL); @@ -589,7 +592,7 @@ static s32 mlx90632_calc_temp_object(s64 object, s64 ambient, s32 Ea, s32 Eb, kTA = (Ea * 1000LL) >> 16LL; kTA0 = (Eb * 1000LL) >> 8LL; - TAdut = div64_s64(((ambient - kTA0) * 1000000LL), kTA) + 25 * 1000000LL; + TAdut = div64_s64((ambient - kTA0) * 1000000LL, kTA) + 25 * 1000000LL; TAdut4 = mlx90632_calc_ta4(TAdut, 10000LL); /* Iterations of calculation as described in datasheet */ @@ -899,7 +902,7 @@ static int mlx90632_probe(struct i2c_client *client, mlx90632->mtyp = MLX90632_MTYP_EXTENDED; } else if ((read & MLX90632_DSP_MASK) == MLX90632_DSP_VERSION) { dev_dbg(&client->dev, - "Detected Unknown EEPROM calibration %x\n", read); + "Detected Unknown EEPROM calibration %x\n", read); } else { dev_err(&client->dev, "Wrong DSP version %x (expected %x)\n",
There is some inconsistency and whitespace cleanup performed in this patch. It was done on top of my other patches, but I can rebase to head of the togreg branch if it would go in sooner. Signed-off-by: Crt Mori <cmo@melexis.com> --- drivers/iio/temperature/mlx90632.c | 41 ++++++++++++++++-------------- 1 file changed, 22 insertions(+), 19 deletions(-)