On Thu, 3 Sep 2020 16:21:03 +0300
Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> wrote:
> ADC-TM5 driver will make use of several functions from ADC5 driver. Move
> them to qcom-vadc-common driver.
>
LGTM
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/iio/adc/qcom-spmi-adc5.c | 75 +++---------------------------
> drivers/iio/adc/qcom-vadc-common.c | 68 ++++++++++++++++++++++++++-
> drivers/iio/adc/qcom-vadc-common.h | 10 +++-
> 3 files changed, 82 insertions(+), 71 deletions(-)
>
> diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
> index b4b73c9920b4..30b8867b31e4 100644
> --- a/drivers/iio/adc/qcom-spmi-adc5.c
> +++ b/drivers/iio/adc/qcom-spmi-adc5.c
> @@ -154,18 +154,6 @@ struct adc5_chip {
> const struct adc5_data *data;
> };
>
> -static const struct vadc_prescale_ratio adc5_prescale_ratios[] = {
> - {.num = 1, .den = 1},
> - {.num = 1, .den = 3},
> - {.num = 1, .den = 4},
> - {.num = 1, .den = 6},
> - {.num = 1, .den = 20},
> - {.num = 1, .den = 8},
> - {.num = 10, .den = 81},
> - {.num = 1, .den = 10},
> - {.num = 1, .den = 16}
> -};
> -
> static int adc5_read(struct adc5_chip *adc, u16 offset, u8 *data, int len)
> {
> return regmap_bulk_read(adc->regmap, adc->base + offset, data, len);
> @@ -181,55 +169,6 @@ static int adc5_masked_write(struct adc5_chip *adc, u16 offset, u8 mask, u8 val)
> return regmap_update_bits(adc->regmap, adc->base + offset, mask, val);
> }
>
> -static int adc5_prescaling_from_dt(u32 num, u32 den)
> -{
> - unsigned int pre;
> -
> - for (pre = 0; pre < ARRAY_SIZE(adc5_prescale_ratios); pre++)
> - if (adc5_prescale_ratios[pre].num == num &&
> - adc5_prescale_ratios[pre].den == den)
> - break;
> -
> - if (pre == ARRAY_SIZE(adc5_prescale_ratios))
> - return -EINVAL;
> -
> - return pre;
> -}
> -
> -static int adc5_hw_settle_time_from_dt(u32 value,
> - const unsigned int *hw_settle)
> -{
> - unsigned int i;
> -
> - for (i = 0; i < VADC_HW_SETTLE_SAMPLES_MAX; i++) {
> - if (value == hw_settle[i])
> - return i;
> - }
> -
> - return -EINVAL;
> -}
> -
> -static int adc5_avg_samples_from_dt(u32 value)
> -{
> - if (!is_power_of_2(value) || value > ADC5_AVG_SAMPLES_MAX)
> - return -EINVAL;
> -
> - return __ffs(value);
> -}
> -
> -static int adc5_decimation_from_dt(u32 value,
> - const unsigned int *decimation)
> -{
> - unsigned int i;
> -
> - for (i = 0; i < ADC5_DECIMATION_SAMPLES_MAX; i++) {
> - if (value == decimation[i])
> - return i;
> - }
> -
> - return -EINVAL;
> -}
> -
> static int adc5_read_voltage_data(struct adc5_chip *adc, u16 *data)
> {
> int ret;
> @@ -511,7 +450,7 @@ static int adc_read_raw_common(struct iio_dev *indio_dev,
> return ret;
>
> ret = qcom_adc5_hw_scale(prop->scale_fn_type,
> - &adc5_prescale_ratios[prop->prescale],
> + prop->prescale,
> adc->data,
> adc_code_volt, val);
> if (ret)
> @@ -717,7 +656,7 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc,
>
> ret = of_property_read_u32(node, "qcom,decimation", &value);
> if (!ret) {
> - ret = adc5_decimation_from_dt(value, data->decimation);
> + ret = qcom_adc5_decimation_from_dt(value, data->decimation);
> if (ret < 0) {
> dev_err(dev, "%02x invalid decimation %d\n",
> chan, value);
> @@ -730,7 +669,7 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc,
>
> ret = of_property_read_u32_array(node, "qcom,pre-scaling", varr, 2);
> if (!ret) {
> - ret = adc5_prescaling_from_dt(varr[0], varr[1]);
> + ret = qcom_adc5_prescaling_from_dt(varr[0], varr[1]);
> if (ret < 0) {
> dev_err(dev, "%02x invalid pre-scaling <%d %d>\n",
> chan, varr[0], varr[1]);
> @@ -759,11 +698,9 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc,
> if ((dig_version[0] >= ADC5_HW_SETTLE_DIFF_MINOR &&
> dig_version[1] >= ADC5_HW_SETTLE_DIFF_MAJOR) ||
> adc->data->info == &adc7_info)
> - ret = adc5_hw_settle_time_from_dt(value,
> - data->hw_settle_2);
> + ret = qcom_adc5_hw_settle_time_from_dt(value, data->hw_settle_2);
> else
> - ret = adc5_hw_settle_time_from_dt(value,
> - data->hw_settle_1);
> + ret = qcom_adc5_hw_settle_time_from_dt(value, data->hw_settle_1);
>
> if (ret < 0) {
> dev_err(dev, "%02x invalid hw-settle-time %d us\n",
> @@ -777,7 +714,7 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc,
>
> ret = of_property_read_u32(node, "qcom,avg-samples", &value);
> if (!ret) {
> - ret = adc5_avg_samples_from_dt(value);
> + ret = qcom_adc5_avg_samples_from_dt(value);
> if (ret < 0) {
> dev_err(dev, "%02x invalid avg-samples %d\n",
> chan, value);
> diff --git a/drivers/iio/adc/qcom-vadc-common.c b/drivers/iio/adc/qcom-vadc-common.c
> index 5113aaa6ba67..d11f3343ad52 100644
> --- a/drivers/iio/adc/qcom-vadc-common.c
> +++ b/drivers/iio/adc/qcom-vadc-common.c
> @@ -278,6 +278,18 @@ static const struct vadc_map_pt adcmap7_100k[] = {
> { 2420, 130048 }
> };
>
> +static const struct vadc_prescale_ratio adc5_prescale_ratios[] = {
> + {.num = 1, .den = 1},
> + {.num = 1, .den = 3},
> + {.num = 1, .den = 4},
> + {.num = 1, .den = 6},
> + {.num = 1, .den = 20},
> + {.num = 1, .den = 8},
> + {.num = 10, .den = 81},
> + {.num = 1, .den = 10},
> + {.num = 1, .den = 16}
> +};
> +
> static int qcom_vadc_scale_hw_calib_volt(
> const struct vadc_prescale_ratio *prescale,
> const struct adc5_data *data,
> @@ -647,10 +659,12 @@ int qcom_vadc_scale(enum vadc_scale_fn_type scaletype,
> EXPORT_SYMBOL(qcom_vadc_scale);
>
> int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype,
> - const struct vadc_prescale_ratio *prescale,
> + unsigned int prescale_ratio,
> const struct adc5_data *data,
> u16 adc_code, int *result)
> {
> + const struct vadc_prescale_ratio *prescale = &adc5_prescale_ratios[prescale_ratio];
> +
> if (!(scaletype >= SCALE_HW_CALIB_DEFAULT &&
> scaletype < SCALE_HW_CALIB_INVALID)) {
> pr_err("Invalid scale type %d\n", scaletype);
> @@ -662,6 +676,58 @@ int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype,
> }
> EXPORT_SYMBOL(qcom_adc5_hw_scale);
>
> +int qcom_adc5_prescaling_from_dt(u32 num, u32 den)
> +{
> + unsigned int pre;
> +
> + for (pre = 0; pre < ARRAY_SIZE(adc5_prescale_ratios); pre++)
> + if (adc5_prescale_ratios[pre].num == num &&
> + adc5_prescale_ratios[pre].den == den)
> + break;
> +
> + if (pre == ARRAY_SIZE(adc5_prescale_ratios))
> + return -EINVAL;
> +
> + return pre;
> +}
> +EXPORT_SYMBOL(qcom_adc5_prescaling_from_dt);
> +
> +int qcom_adc5_hw_settle_time_from_dt(u32 value,
> + const unsigned int *hw_settle)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < VADC_HW_SETTLE_SAMPLES_MAX; i++) {
> + if (value == hw_settle[i])
> + return i;
> + }
> +
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL(qcom_adc5_hw_settle_time_from_dt);
> +
> +int qcom_adc5_avg_samples_from_dt(u32 value)
> +{
> + if (!is_power_of_2(value) || value > ADC5_AVG_SAMPLES_MAX)
> + return -EINVAL;
> +
> + return __ffs(value);
> +}
> +EXPORT_SYMBOL(qcom_adc5_avg_samples_from_dt);
> +
> +int qcom_adc5_decimation_from_dt(u32 value, const unsigned int *decimation)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < ADC5_DECIMATION_SAMPLES_MAX; i++) {
> + if (value == decimation[i])
> + return i;
> + }
> +
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL(qcom_adc5_decimation_from_dt);
> +
> int qcom_vadc_decimation_from_dt(u32 value)
> {
> if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||
> diff --git a/drivers/iio/adc/qcom-vadc-common.h b/drivers/iio/adc/qcom-vadc-common.h
> index 17b2fc4d8bf2..7e5f6428e311 100644
> --- a/drivers/iio/adc/qcom-vadc-common.h
> +++ b/drivers/iio/adc/qcom-vadc-common.h
> @@ -168,10 +168,18 @@ struct qcom_adc5_scale_type {
> };
>
> int qcom_adc5_hw_scale(enum vadc_scale_fn_type scaletype,
> - const struct vadc_prescale_ratio *prescale,
> + unsigned int prescale_ratio,
> const struct adc5_data *data,
> u16 adc_code, int *result_mdec);
>
> +int qcom_adc5_prescaling_from_dt(u32 num, u32 den);
> +
> +int qcom_adc5_hw_settle_time_from_dt(u32 value, const unsigned int *hw_settle);
> +
> +int qcom_adc5_avg_samples_from_dt(u32 value);
> +
> +int qcom_adc5_decimation_from_dt(u32 value, const unsigned int *decimation);
> +
> int qcom_vadc_decimation_from_dt(u32 value);
>
> #endif /* QCOM_VADC_COMMON_H */
