2022-08-05 13:59:31

by Marijn Suijten

[permalink] [raw]
Subject: [PATCH v2 2/5] iio: adc: qcom-spmi-adc5: Add missing VCOIN/GPIO[134] channels

These channels are specified in downstream kernels [1] and actively used
by e.g. the Sony Seine platform on the SM6125 SoC. Note that GPIO2
isn't used on this platform and, while the definition downstream is
identical to the other GPIOx_100K_PU definitions, has been omitted for
lack of proper testing.

[1]: https://source.codeaurora.org/quic/la/kernel/msm-4.14/tree/drivers/iio/adc/qcom-spmi-adc5.c?h=LA.UM.7.11.r1-05200-NICOBAR.0#n688

Signed-off-by: Marijn Suijten <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/iio/adc/qcom-spmi-adc5.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
index 87438d1e5c0b..0dc4fe612433 100644
--- a/drivers/iio/adc/qcom-spmi-adc5.c
+++ b/drivers/iio/adc/qcom-spmi-adc5.c
@@ -526,6 +526,8 @@ static const struct adc5_channels adc5_chans_pmic[ADC5_MAX_CHANNEL] = {
SCALE_HW_CALIB_DEFAULT)
[ADC5_VBAT_SNS] = ADC5_CHAN_VOLT("vbat_sns", 1,
SCALE_HW_CALIB_DEFAULT)
+ [ADC5_VCOIN] = ADC5_CHAN_VOLT("vcoin", 1,
+ SCALE_HW_CALIB_DEFAULT)
[ADC5_DIE_TEMP] = ADC5_CHAN_TEMP("die_temp", 0,
SCALE_HW_CALIB_PMIC_THERM)
[ADC5_USB_IN_I] = ADC5_CHAN_VOLT("usb_in_i_uv", 0,
@@ -549,6 +551,12 @@ static const struct adc5_channels adc5_chans_pmic[ADC5_MAX_CHANNEL] = {
SCALE_HW_CALIB_THERM_100K_PULLUP)
[ADC5_AMUX_THM2] = ADC5_CHAN_TEMP("amux_thm2", 0,
SCALE_HW_CALIB_PM5_SMB_TEMP)
+ [ADC5_GPIO1_100K_PU] = ADC5_CHAN_TEMP("gpio1_100k_pu", 0,
+ SCALE_HW_CALIB_THERM_100K_PULLUP)
+ [ADC5_GPIO3_100K_PU] = ADC5_CHAN_TEMP("gpio3_100k_pu", 0,
+ SCALE_HW_CALIB_THERM_100K_PULLUP)
+ [ADC5_GPIO4_100K_PU] = ADC5_CHAN_TEMP("gpio4_100k_pu", 0,
+ SCALE_HW_CALIB_THERM_100K_PULLUP)
};

static const struct adc5_channels adc7_chans_pmic[ADC5_MAX_CHANNEL] = {
--
2.37.1



2022-08-06 14:23:31

by Jonathan Cameron

[permalink] [raw]
Subject: Re: [PATCH v2 2/5] iio: adc: qcom-spmi-adc5: Add missing VCOIN/GPIO[134] channels

On Fri, 5 Aug 2022 15:57:26 +0200
Marijn Suijten <[email protected]> wrote:

> These channels are specified in downstream kernels [1] and actively used
> by e.g. the Sony Seine platform on the SM6125 SoC. Note that GPIO2
> isn't used on this platform and, while the definition downstream is
> identical to the other GPIOx_100K_PU definitions, has been omitted for
> lack of proper testing.
>
> [1]: https://source.codeaurora.org/quic/la/kernel/msm-4.14/tree/drivers/iio/adc/qcom-spmi-adc5.c?h=LA.UM.7.11.r1-05200-NICOBAR.0#n688
>
> Signed-off-by: Marijn Suijten <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Applied to the togreg branch of iio.git. Note that I'll only push it out as testing
for now as I plan to rebase after rc1 is available.

Thanks,

Jonathan

> ---
> drivers/iio/adc/qcom-spmi-adc5.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
> index 87438d1e5c0b..0dc4fe612433 100644
> --- a/drivers/iio/adc/qcom-spmi-adc5.c
> +++ b/drivers/iio/adc/qcom-spmi-adc5.c
> @@ -526,6 +526,8 @@ static const struct adc5_channels adc5_chans_pmic[ADC5_MAX_CHANNEL] = {
> SCALE_HW_CALIB_DEFAULT)
> [ADC5_VBAT_SNS] = ADC5_CHAN_VOLT("vbat_sns", 1,
> SCALE_HW_CALIB_DEFAULT)
> + [ADC5_VCOIN] = ADC5_CHAN_VOLT("vcoin", 1,
> + SCALE_HW_CALIB_DEFAULT)
> [ADC5_DIE_TEMP] = ADC5_CHAN_TEMP("die_temp", 0,
> SCALE_HW_CALIB_PMIC_THERM)
> [ADC5_USB_IN_I] = ADC5_CHAN_VOLT("usb_in_i_uv", 0,
> @@ -549,6 +551,12 @@ static const struct adc5_channels adc5_chans_pmic[ADC5_MAX_CHANNEL] = {
> SCALE_HW_CALIB_THERM_100K_PULLUP)
> [ADC5_AMUX_THM2] = ADC5_CHAN_TEMP("amux_thm2", 0,
> SCALE_HW_CALIB_PM5_SMB_TEMP)
> + [ADC5_GPIO1_100K_PU] = ADC5_CHAN_TEMP("gpio1_100k_pu", 0,
> + SCALE_HW_CALIB_THERM_100K_PULLUP)
> + [ADC5_GPIO3_100K_PU] = ADC5_CHAN_TEMP("gpio3_100k_pu", 0,
> + SCALE_HW_CALIB_THERM_100K_PULLUP)
> + [ADC5_GPIO4_100K_PU] = ADC5_CHAN_TEMP("gpio4_100k_pu", 0,
> + SCALE_HW_CALIB_THERM_100K_PULLUP)
> };
>
> static const struct adc5_channels adc7_chans_pmic[ADC5_MAX_CHANNEL] = {