iio: adc: introduce Qualcomm SPMI Round Robin ADC
Subsystems (6)
v14 cover iio: adc: introduce Qualcomm SPMI Round Robin ADC
The RRADC is responsible for reading data about the current and voltage from the USB or DC in jacks, it can also read the battery ID (resistence) and some temperatures. It is found on the PMI8998 and PM660 Qualcomm PMICs.
The RRADC has to calibrate some ADC values based on which chip fab the PMIC was produced in, to facilitate this the patches ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") and ("mfd: qcom-spmi-pmic: read fab id on supported PMICs") expose the PMIC revision information and fab_id as a struct and register them as driver data in the Qualcomm SPMI PMIC driver so that it can be read by the RRADC.
The first 3 patches add support for looking up an SPMI device from a struct device_node, as well as introducing support for looking up the base USID of a Qcom PMIC, see patch comments for more details. These Address Bjorns comments on v2.
Changes since v13:
* Address Lee Jones' feedback on the SPMI patches.
* Pick up Jami's patch to enable the RRADC on the OnePlus 5
Changes since v12:
* Apply Krzysztof's suggestions to rradc DT binding docs.
Changes since v11:
* Remove debug logging which was left in ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients")
* Picked up Dmitry's Tested-by and Reviewed-by tags.
Changes since v10:
* Don't inline spmi_device_from_of()
Changes since v9:
* Add back missing copyright, this driver is originally derived from downstream (Thanks Manivannan).
Changes since v8:
* Drop Reported-by for the bugfix on previous revision reported by LKP
* Apply Jonathans suggestions
* Rework patch 2 ("expose the PMIC revid information to clients") to handle PMICs with a single USID (thanks Dmitry)
Changes since v7:
* Addressed Jonathans comments
* Fixed bug reported by LKP
Changes since v6:
* Fix printf format warning in rradc
Changes since v5:
* Add missing EXPORT_SYMBOL_GPL() to
("spmi: add a helper to look up an SPMI device from a device node")
Changes since v4:
* Addressed Jonathan's comments on v4
* Reworked the qcom-spmi-pmic patches to properly walk the devicetree to find the base USID. I've tested this on SDM845 which has two PMICs (pm8998 and pmi8998) and I'm able to look up the PMIC revid from all 4 USIDs.
Changes since v3:
* Split PMIC patch in two, rework to support function drivers on a sibling USID
* Completely rework RRADC driver to make use of the modern IIO framework. This required re-arranging a lot of the equations and results in some lost precision, where relevant I've left comments to explain this. I don't think any of it is significant enough to justify doing post-processing in driver.
Thanks a lot Jonathan and John Stultz for helping me out with this
Changes since v2:
* Add missing include (thanks kernel test robot :D)
* Rework some confusing function return values, specifically rradc_read_status_in_cont_mode and rradc_prepare_batt_id_conversion both of which didn't correctly handle "ret". This also bought up an issue as the previous implementation didn't actually wait for the channel to be ready. It doesn't seem like that's strictly necessary (same data is reported if I wait for the status to be good or not) but I've included it anyway for good measure.
Changes since v1:
* Rework the RRADC driver based on Jonathan's feedback
* Pick up Rob's reviewed by for the dt-binding patch.
---
Caleb Connolly (9):
spmi: add a helper to look up an SPMI device from a device node
mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
mfd: qcom-spmi-pmic: read fab id on supported PMICs
dt-bindings: iio: adc: document qcom-spmi-rradc
iio: adc: qcom-spmi-rradc: introduce round robin adc
arm64: dts: qcom: pmi8998: add rradc node
arm64: dts: qcom: sdm845-oneplus: enable rradc
arm64: dts: qcom: sdm845-db845c: enable rradc
arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradc
Jami Kettunen (1):
arm64: dts: qcom: msm8998-oneplus-common: enable RRADC
.../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 + .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 + drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1021 +++++++++++++++++ drivers/mfd/qcom-spmi-pmic.c | 272 +++-- drivers/spmi/spmi.c | 17 + include/linux/spmi.h | 3 + include/soc/qcom/qcom-spmi-pmic.h | 61 + 13 files changed, 1372 insertions(+), 90 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
Signature · 1 line
2.36.0
PATCH v14 1/10 spmi: add a helper to look up an SPMI device from a device node
The helper function spmi_device_from_of() takes a device node and returns the SPMI device associated with it.
This is like of_find_device_by_node but for SPMI devices.
--- drivers/spmi/spmi.c | 17 +++++++++++++++++ include/linux/spmi.h | 3 +++ 2 files changed, 20 insertions(+)
drivers/spmi/spmi.c +17 -0
@@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { .uevent = spmi_drv_uevent, }; +/** +* spmi_device_from_of() - get the associated SPMI device from a device node +* +* @np: device node +* +* Returns the struct spmi_device associated with a device node or NULL. +*/ +struct spmi_device *spmi_device_from_of (struct device_node *np) +{ +struct device *dev =bus_find_device_by_of_node (&spmi_bus_type, np); + +if (dev) +return to_spmi_device (dev); +return NULL ; +} +EXPORT_SYMBOL_GPL (spmi_device_from_of); +/** * spmi_controller_alloc() - Allocate a new SPMI device * @ctrl: associated controller
include/linux/spmi.h +3 -0
@@ -164,6 +164,9 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv)module_driver (__spmi_driver, spmi_driver_register, \ spmi_driver_unregister) +struct device_node ; + +struct spmi_device *spmi_device_from_of (struct device_node *np);int spmi_register_read (struct spmi_device *sdev,u8 addr,u8 *buf);int spmi_ext_register_read (struct spmi_device *sdev,u8 addr,u8 *buf,size_t len);
Signature · 1 line
2.36.0
Jonathan Cameron
maintainerRe: [PATCH v14 01/10] spmi: add a helper to look up an SPMI device from a device node
Quoted 5 lines · On Fri, 29 Apr 2022 23:08:56 +0100 Caleb Connolly <[email protected]>…
The helper function
spmi_device_from_of()takes a device node and returns the SPMI device associated with it.
This is likeof_find_device_by_nodebut for SPMI devices.Signed-off-by Caleb Connolly <[email protected]>
Stephen, are you fine with this addition to spmi?
Given bulk of this series in in IIO I'm planning to pick up once everyone is happy with it.
Thanks,
Jonathan
Quoted 47 lines
--- drivers/spmi/spmi.c | 17 +++++++++++++++++ include/linux/spmi.h | 3 +++ 2 files changed, 20 insertions(+)drivers/spmi/spmi.c +17
-0@@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { .uevent = spmi_drv_uevent, }; +/** +* spmi_device_from_of() - get the associated SPMI device from a device node +* +* @np: device node +* +* Returns the struct spmi_device associated with a device node or NULL. +*/ +struct spmi_device *spmi_device_from_of (struct device_node *np) +{ +struct device *dev =bus_find_device_by_of_node (&spmi_bus_type, np); + +if (dev) +return to_spmi_device (dev); +return NULL ; +} +EXPORT_SYMBOL_GPL (spmi_device_from_of); +/** * spmi_controller_alloc() - Allocate a new SPMI device * @ctrl: associated controller include/linux/spmi.h +3
-0@@ -164,6 +164,9 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv)module_driver (__spmi_driver, spmi_driver_register, \ spmi_driver_unregister) +struct device_node ; + +struct spmi_device *spmi_device_from_of (struct device_node *np);int spmi_register_read (struct spmi_device *sdev,u8 addr,u8 *buf);int spmi_ext_register_read (struct spmi_device *sdev,u8 addr,u8 *buf,size_t len);
Jonathan Cameron
maintainerRe: [PATCH v14 01/10] spmi: add a helper to look up an SPMI device from a device node
Quoted 10 lines · On Sun, 1 May 2022 18:23:23 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 5 lines · On Fri, 29 Apr 2022 23:08:56 +0100 Caleb Connolly <[email protected]>…
The helper function
spmi_device_from_of()takes a device node and returns the SPMI device associated with it.
This is likeof_find_device_by_nodebut for SPMI devices.Signed-off-by Caleb Connolly <[email protected]>Stephen, are you fine with this addition to spmi?
Stephen. This is still waiting for an SPMI ack.
Thanks,
Jonathan
Quoted 57 lines
Given bulk of this series in in IIO I'm planning to pick up once everyone is happy with it.
Thanks,
Jonathan
Quoted 47 lines
--- drivers/spmi/spmi.c | 17 +++++++++++++++++ include/linux/spmi.h | 3 +++ 2 files changed, 20 insertions(+)drivers/spmi/spmi.c +17
-0@@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { .uevent = spmi_drv_uevent, }; +/** +* spmi_device_from_of() - get the associated SPMI device from a device node +* +* @np: device node +* +* Returns the struct spmi_device associated with a device node or NULL. +*/ +struct spmi_device *spmi_device_from_of (struct device_node *np) +{ +struct device *dev =bus_find_device_by_of_node (&spmi_bus_type, np); + +if (dev) +return to_spmi_device (dev); +return NULL ; +} +EXPORT_SYMBOL_GPL (spmi_device_from_of); +/** * spmi_controller_alloc() - Allocate a new SPMI device * @ctrl: associated controller include/linux/spmi.h +3
-0@@ -164,6 +164,9 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv)module_driver (__spmi_driver, spmi_driver_register, \ spmi_driver_unregister) +struct device_node ; + +struct spmi_device *spmi_device_from_of (struct device_node *np);int spmi_register_read (struct spmi_device *sdev,u8 addr,u8 *buf);int spmi_ext_register_read (struct spmi_device *sdev,u8 addr,u8 *buf,size_t len);
Re: [PATCH v14 01/10] spmi: add a helper to look up an SPMI device from a device node
In reply to Caleb ConnollyQuoting Caleb Connolly (2022-04-29 15:08:56)
Quoted 6 lines
The helper function
spmi_device_from_of()takes a device node and returns the SPMI device associated with it.
This is likeof_find_device_by_nodebut for SPMI devices.Signed-off-by Caleb Connolly <[email protected]>---
PATCH v14 2/10 mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
In reply to Caleb ConnollySome PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this.
This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime.
--- drivers/mfd/qcom-spmi-pmic.c | 265 ++++++++++++++++++++---------- include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++ 2 files changed, 235 insertions(+), 90 deletions(-) create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
drivers/mfd/qcom-spmi-pmic.c +175 -90
@@ -3,11 +3,16 @@* Copyright (c) 2014, The Linux Foundation. All rights reserved. */ +#include <linux/device.h> +#include <linux/errno.h> +#include <linux/gfp.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/spmi.h> +#include <linux/types.h> #include <linux/regmap.h> #include <linux/of_platform.h> +#include <soc/qcom/qcom-spmi-pmic.h> #define PMIC_REV2 0x101#define PMIC_REV3 0x102
@@ -17,106 +22,140 @@#define PMIC_TYPE_VALUE 0x51 -#define COMMON_SUBTYPE 0x00 -#define PM8941_SUBTYPE 0x01 -#define PM8841_SUBTYPE 0x02 -#define PM8019_SUBTYPE 0x03 -#define PM8226_SUBTYPE 0x04 -#define PM8110_SUBTYPE 0x05 -#define PMA8084_SUBTYPE 0x06 -#define PMI8962_SUBTYPE 0x07 -#define PMD9635_SUBTYPE 0x08 -#define PM8994_SUBTYPE 0x09 -#define PMI8994_SUBTYPE 0x0a -#define PM8916_SUBTYPE 0x0b -#define PM8004_SUBTYPE 0x0c -#define PM8909_SUBTYPE 0x0d -#define PM8028_SUBTYPE 0x0e -#define PM8901_SUBTYPE 0x0f -#define PM8950_SUBTYPE 0x10 -#define PMI8950_SUBTYPE 0x11 -#define PM8998_SUBTYPE 0x14 -#define PMI8998_SUBTYPE 0x15 -#define PM8005_SUBTYPE 0x18 -#define PM660L_SUBTYPE 0x1A -#define PM660_SUBTYPE 0x1B -#define PM8150_SUBTYPE 0x1E -#define PM8150L_SUBTYPE 0x1f -#define PM8150B_SUBTYPE 0x20 -#define PMK8002_SUBTYPE 0x21 -#define PM8009_SUBTYPE 0x24 -#define PM8150C_SUBTYPE 0x26 -#define SMB2351_SUBTYPE 0x29 +#define PMIC_REV4_V2 0x02 + +struct qcom_spmi_dev { +int num_usids; +struct qcom_spmi_pmic pmic; +}; + +#define N_USIDS (n) ((void *)n)static const struct of_device_id pmic_spmi_id_table[] = { - { .compatible ="qcom,pm660" , .data = (void *)PM660_SUBTYPE }, - { .compatible ="qcom,pm660l" , .data = (void *)PM660L_SUBTYPE }, - { .compatible ="qcom,pm8004" , .data = (void *)PM8004_SUBTYPE }, - { .compatible ="qcom,pm8005" , .data = (void *)PM8005_SUBTYPE }, - { .compatible ="qcom,pm8019" , .data = (void *)PM8019_SUBTYPE }, - { .compatible ="qcom,pm8028" , .data = (void *)PM8028_SUBTYPE }, - { .compatible ="qcom,pm8110" , .data = (void *)PM8110_SUBTYPE }, - { .compatible ="qcom,pm8150" , .data = (void *)PM8150_SUBTYPE }, - { .compatible ="qcom,pm8150b" , .data = (void *)PM8150B_SUBTYPE }, - { .compatible ="qcom,pm8150c" , .data = (void *)PM8150C_SUBTYPE }, - { .compatible ="qcom,pm8150l" , .data = (void *)PM8150L_SUBTYPE }, - { .compatible ="qcom,pm8226" , .data = (void *)PM8226_SUBTYPE }, - { .compatible ="qcom,pm8841" , .data = (void *)PM8841_SUBTYPE }, - { .compatible ="qcom,pm8901" , .data = (void *)PM8901_SUBTYPE }, - { .compatible ="qcom,pm8909" , .data = (void *)PM8909_SUBTYPE }, - { .compatible ="qcom,pm8916" , .data = (void *)PM8916_SUBTYPE }, - { .compatible ="qcom,pm8941" , .data = (void *)PM8941_SUBTYPE }, - { .compatible ="qcom,pm8950" , .data = (void *)PM8950_SUBTYPE }, - { .compatible ="qcom,pm8994" , .data = (void *)PM8994_SUBTYPE }, - { .compatible ="qcom,pm8998" , .data = (void *)PM8998_SUBTYPE }, - { .compatible ="qcom,pma8084" , .data = (void *)PMA8084_SUBTYPE }, - { .compatible ="qcom,pmd9635" , .data = (void *)PMD9635_SUBTYPE }, - { .compatible ="qcom,pmi8950" , .data = (void *)PMI8950_SUBTYPE }, - { .compatible ="qcom,pmi8962" , .data = (void *)PMI8962_SUBTYPE }, - { .compatible ="qcom,pmi8994" , .data = (void *)PMI8994_SUBTYPE }, - { .compatible ="qcom,pmi8998" , .data = (void *)PMI8998_SUBTYPE }, - { .compatible ="qcom,pmk8002" , .data = (void *)PMK8002_SUBTYPE }, - { .compatible ="qcom,smb2351" , .data = (void *)SMB2351_SUBTYPE }, - { .compatible ="qcom,spmi-pmic" , .data = (void *)COMMON_SUBTYPE }, + { .compatible ="qcom,pm660" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm660l" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8004" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8005" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8019" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8028" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8110" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8150" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8150b" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8150c" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8150l" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8226" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8841" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8901" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8909" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8916" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8941" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8950" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8994" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pm8998" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pma8084" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmd9635" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmi8950" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmi8962" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmi8994" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmi8998" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,pmk8002" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,smb2351" , .data =N_USIDS (2 ) }, + { .compatible ="qcom,spmi-pmic" , .data =N_USIDS (1 ) }, { } }; -static void pmic_spmi_show_revid (struct regmap *map,struct device *dev) +/* +* A PMIC can be represented by multiple SPMI devices, but +* only the base PMIC device will contain a reference to +* the revision information. +* +* This function takes a pointer to a pmic device and +* returns a pointer to the base PMIC device. +* +* This only supports PMICs with 1 or 2 USIDs. +*/ +static struct spmi_device *qcom_pmic_get_base_usid (struct device *dev) { -unsigned int rev2, minor, major, type, subtype; -const char *name ="unknown" ; -int ret, i; +struct spmi_device *sdev; +struct qcom_spmi_dev *ctx; +struct device_node *spmi_bus; +struct device_node *other_usid =NULL ; +int function_parent_usid, ret; +u32 pmic_addr; - ret =regmap_read (map,PMIC_TYPE , &type); -if (ret <0 ) -return ; + sdev =to_spmi_device (dev); + ctx =dev_get_drvdata (&sdev->dev); + +/* +* Quick return if the function device is already in the base +* USID. This will always be hit for PMICs with only 1 USID. +*/ +if (sdev->usid % ctx->num_usids ==0 ) +return sdev; -if (type !=PMIC_TYPE_VALUE ) -return ; + function_parent_usid = sdev->usid; + +/* +* Walk through the list of PMICs until we find the sibling USID. +* The goal is to find the first USID which is less than the +* number of USIDs in the PMIC array, e.g. for a PMIC with 2 USIDs +* where the function device is under USID 3, we want to find the +* device for USID 2. +*/ + spmi_bus =of_get_parent (sdev->dev.of_node); +do { + other_usid =of_get_next_child (spmi_bus, other_usid); + + ret =of_property_read_u32_index (other_usid,"reg" ,0 , &pmic_addr); +if (ret) +return ERR_PTR (ret); + + sdev =spmi_device_from_of (other_usid); +if (pmic_addr == function_parent_usid - (ctx->num_usids -1 )) { +if (!sdev) +/* +* If the base USID for this PMIC hasn't probed yet +* but the secondary USID has, then we need to defer +* the function driver so that it will attempt to +* probe again when the base USID is ready. +*/ +return ERR_PTR (-EPROBE_DEFER ); +return sdev; + } + }while (other_usid->sibling); + +return ERR_PTR (-ENODATA ); +} + +static int pmic_spmi_load_revid (struct regmap *map,struct device *dev, +struct qcom_spmi_pmic *pmic) +{ +int ret; - ret =regmap_read (map,PMIC_SUBTYPE , &subtype); + ret =regmap_read (map,PMIC_TYPE , &pmic->type);if (ret <0 ) -return ; +return ret; -for (i =0 ; i <ARRAY_SIZE (pmic_spmi_id_table); i++) { -if (subtype == (unsigned long )pmic_spmi_id_table[i].data) -break ; - } +if (pmic->type !=PMIC_TYPE_VALUE ) +return ret; + + ret =regmap_read (map,PMIC_SUBTYPE , &pmic->subtype); +if (ret <0 ) +return ret; -if (i !=ARRAY_SIZE (pmic_spmi_id_table)) - name = pmic_spmi_id_table[i].compatible; + pmic->name =of_match_device (pmic_spmi_id_table, dev)->compatible; - ret =regmap_read (map,PMIC_REV2 , &rev2); + ret =regmap_read (map,PMIC_REV2 , &pmic->rev2);if (ret <0 ) -return ; +return ret; - ret =regmap_read (map,PMIC_REV3 , &minor); + ret =regmap_read (map,PMIC_REV3 , &pmic->minor);if (ret <0 ) -return ; +return ret; - ret =regmap_read (map,PMIC_REV4 , &major); + ret =regmap_read (map,PMIC_REV4 , &pmic->major);if (ret <0 ) -return ; +return ret;/* * In early versions of PM8941 and PM8226, the major revision number
@@ -124,15 +163,49 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev)* Increment the major revision number here if the chip is an early * version of PM8941 or PM8226. */ -if ((subtype ==PM8941_SUBTYPE || subtype ==PM8226_SUBTYPE ) && - major <0x02 ) - major++; +if ((pmic->subtype ==PM8941_SUBTYPE || pmic->subtype ==PM8226_SUBTYPE ) && + pmic->major <PMIC_REV4_V2 ) + pmic->major++; + +if (pmic->subtype ==PM8110_SUBTYPE ) + pmic->minor = pmic->rev2; + +dev_dbg (dev,"%x: %s v%d.%d\n" , + pmic->subtype, pmic->name, pmic->major, pmic->minor); + +return 0 ; +} + +/** +* qcom_pmic_get() - Get a pointer to the base PMIC device +* +* This function takes a struct device for a driver which is a child of a PMIC. +* And locates the PMIC revision information for it. +* +* @dev: the pmic function device +* @return: the struct qcom_spmi_pmic* pointer associated with the function device +*/ +inline const struct qcom_spmi_pmic *qcom_pmic_get (struct device *dev) +{ +struct spmi_device *sdev; +struct qcom_spmi_dev *spmi; + +/* +* Make sure the device is actually a child of a PMIC +*/ +if (!of_match_device (pmic_spmi_id_table, dev->parent)) +return ERR_PTR (-EINVAL ); + + sdev =qcom_pmic_get_base_usid (dev->parent); -if (subtype ==PM8110_SUBTYPE ) - minor = rev2; +if (IS_ERR (sdev)) +return ERR_CAST (sdev); -dev_dbg (dev,"%x: %s v%d.%d\n" , subtype, name, major, minor); + spmi = (struct qcom_spmi_dev *)dev_get_drvdata (&sdev->dev); + +return &spmi->pmic; } +EXPORT_SYMBOL (qcom_pmic_get);static const struct regmap_config spmi_regmap_config = { .reg_bits =16 ,
@@ -144,14 +217,26 @@ static const struct regmap_config spmi_regmap_config = {static int pmic_spmi_probe (struct spmi_device *sdev) {struct regmap *regmap; +struct qcom_spmi_dev *ctx; +int ret; regmap =devm_regmap_init_spmi_ext (sdev, &spmi_regmap_config);if (IS_ERR (regmap))return PTR_ERR (regmap); + ctx =devm_kzalloc (&sdev->dev,sizeof (*ctx),GFP_KERNEL ); +if (!ctx) +return -ENOMEM ; + + ctx->num_usids = (uintptr_t )of_device_get_match_data (&sdev->dev); +/* Only the first slave id for a PMIC contains this information */ -if (sdev->usid %2 ==0 ) -pmic_spmi_show_revid (regmap, &sdev->dev); +if (sdev->usid % ctx->num_usids ==0 ) { + ret =pmic_spmi_load_revid (regmap, &sdev->dev, &ctx->pmic); +if (ret <0 ) +return ret; + } +spmi_device_set_drvdata (sdev, ctx);return devm_of_platform_populate (&sdev->dev); }
include/soc/qcom/qcom-spmi-pmic.h new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.36.0
Jonathan Cameron
maintainerRe: [PATCH v14 02/10] mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
Quoted 12 lines · On Fri, 29 Apr 2022 23:08:57 +0100 Caleb Connolly <[email protected]>…
Some PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this.
This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime.
Signed-off-by Caleb Connolly <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Tested-by Dmitry Baryshkov <[email protected]>
...
Quoted 19 lines
drivers/mfd/qcom-spmi-pmic.c +19
-0+/** +* qcom_pmic_get() - Get a pointer to the base PMIC device +* +* This function takes a struct device for a driver which is a child of a PMIC. +* And locates the PMIC revision information for it. +* +* @dev: the pmic function device +* @return: the struct qcom_spmi_pmic* pointer associated with the function device +*/ +inline const struct qcom_spmi_pmic *qcom_pmic_get (struct device *dev) +{ +struct spmi_device *sdev; +struct qcom_spmi_dev *spmi; + +/* +* Make sure the device is actually a child of a PMIC +*/ +if (!of_match_device (pmic_spmi_id_table, dev->parent)) +return ERR_PTR (-EINVAL );
drivers/mfd/qcom-spmi-pmic.c static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) · line 204
Quoted 10 lines
drivers/mfd/qcom-spmi-pmic.c +5
-3+ + sdev =qcom_pmic_get_base_usid (dev->parent); -if (subtype ==PM8110_SUBTYPE ) - minor = rev2; +if (IS_ERR (sdev)) +return ERR_CAST (sdev); -dev_dbg (dev,"%x: %s v%d.%d\n" , subtype, name, major, minor); + spmi = (struct qcom_spmi_dev *)dev_get_drvdata (&sdev->dev);
Shouldn't need the cast as dev_get_drvdata() returns void * and you can implicitly cast that to any other pointer type.
If this is all that comes up in the series I can fixup whilst applying.
Jonathan
Quoted 5 lines
drivers/mfd/qcom-spmi-pmic.c +3
-0+ +return &spmi->pmic; } +EXPORT_SYMBOL (qcom_pmic_get);
Jonathan Cameron
maintainerRe: [PATCH v14 02/10] mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
Quoted 51 lines · On Sun, 1 May 2022 18:28:29 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 12 lines · On Fri, 29 Apr 2022 23:08:57 +0100 Caleb Connolly <[email protected]>…
Some PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this.
This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime.
Signed-off-by Caleb Connolly <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Tested-by Dmitry Baryshkov <[email protected]>...
Quoted 19 lines
drivers/mfd/qcom-spmi-pmic.c +19
-0+/** +* qcom_pmic_get() - Get a pointer to the base PMIC device +* +* This function takes a struct device for a driver which is a child of a PMIC. +* And locates the PMIC revision information for it. +* +* @dev: the pmic function device +* @return: the struct qcom_spmi_pmic* pointer associated with the function device +*/ +inline const struct qcom_spmi_pmic *qcom_pmic_get (struct device *dev) +{ +struct spmi_device *sdev; +struct qcom_spmi_dev *spmi; + +/* +* Make sure the device is actually a child of a PMIC +*/ +if (!of_match_device (pmic_spmi_id_table, dev->parent)) +return ERR_PTR (-EINVAL );drivers/mfd/qcom-spmi-pmic.c static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) · line 204
Quoted 10 lines
drivers/mfd/qcom-spmi-pmic.c +5
-3+ + sdev =qcom_pmic_get_base_usid (dev->parent); -if (subtype ==PM8110_SUBTYPE ) - minor = rev2; +if (IS_ERR (sdev)) +return ERR_CAST (sdev); -dev_dbg (dev,"%x: %s v%d.%d\n" , subtype, name, major, minor); + spmi = (struct qcom_spmi_dev *)dev_get_drvdata (&sdev->dev);Shouldn't need the cast as
dev_get_drvdata()returns void * and you can implicitly cast that to any other pointer type.
Quoted 3 lines
If this is all that comes up in the series I can fixup whilst applying.
Jonathan
Hi Caleb,
Now Stephen has acked the spmi changes, only remaining ack needed is Lee for mfd. Given it's been a while, perhaps best bet is if you do a v15 just wrapping up those minor tweaks and ping Lee to take a look at it when he has time. On off chance Lee just want's to pick it up and push out an immutable branch (rather than me doing the same, I'll give tags for the IIO effecting bits)
Thanks,
Jonathan
Quoted 8 lines
Quoted 7 lines
drivers/mfd/qcom-spmi-pmic.c +3
-0+ +return &spmi->pmic; } +EXPORT_SYMBOL (qcom_pmic_get);
Re: [PATCH v14 02/10] mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
In reply to Caleb ConnollyQuoted 9 lines · Caleb Connolly
Some PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this.
This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime.
Quoted 8 lines
Signed-off-by Caleb Connolly <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Tested-by Dmitry Baryshkov <[email protected]>--- drivers/mfd/qcom-spmi-pmic.c | 265 ++++++++++++++++++++---------- include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++ 2 files changed, 235 insertions(+), 90 deletions(-) create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
Once Jonathan's comments have been resolved:
Signature · 4 lines
Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Jonathan Cameron
maintainerRe: [PATCH v14 02/10] mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
In reply to Caleb ConnollyQuoted 15 lines · On Fri, 29 Apr 2022 23:08:57 +0100 Caleb Connolly <[email protected]>…
Some PMIC functions such as the RRADC need to be aware of the PMIC chip revision information to implement errata or otherwise adjust behaviour, export the PMIC information to enable this.
This is specifically required to enable the RRADC to adjust coefficients based on which chip fab the PMIC was produced in, this can vary per unique device and therefore has to be read at runtime.
Signed-off-by Caleb Connolly <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Tested-by Dmitry Baryshkov <[email protected]>---
drivers/mfd/qcom-spmi-pmic.c static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) · line 188
Quoted 10 lines
drivers/mfd/qcom-spmi-pmic.c +10
-0+/** +* qcom_pmic_get() - Get a pointer to the base PMIC device +* +* This function takes a struct device for a driver which is a child of a PMIC. +* And locates the PMIC revision information for it. +* +* @dev: the pmic function device +* @return: the struct qcom_spmi_pmic* pointer associated with the function device +*/ +inline const struct qcom_spmi_pmic *qcom_pmic_get (struct device *dev)
Missed this in review, but build test of the rradc patch threw it up. this should defintely not be inline as it's exported.
Same for the header definition.
I'm doing a quick test to see if I can apply this series with relevant tweaks. Will get rid of this inline as well.
Thanks,
Jonathan
Quoted 23 lines
drivers/mfd/qcom-spmi-pmic.c +17
-3+{ +struct spmi_device *sdev; +struct qcom_spmi_dev *spmi; + +/* +* Make sure the device is actually a child of a PMIC +*/ +if (!of_match_device (pmic_spmi_id_table, dev->parent)) +return ERR_PTR (-EINVAL ); + + sdev =qcom_pmic_get_base_usid (dev->parent); -if (subtype ==PM8110_SUBTYPE ) - minor = rev2; +if (IS_ERR (sdev)) +return ERR_CAST (sdev); -dev_dbg (dev,"%x: %s v%d.%d\n" , subtype, name, major, minor); + spmi = (struct qcom_spmi_dev *)dev_get_drvdata (&sdev->dev); + +return &spmi->pmic; } +EXPORT_SYMBOL (qcom_pmic_get);
PATCH v14 3/10 mfd: qcom-spmi-pmic: read fab id on supported PMICs
In reply to Caleb ConnollyThe PMI8998 and PM660 expose the fab_id, this is needed by drivers like the RRADC to calibrate ADC values.
--- drivers/mfd/qcom-spmi-pmic.c | 7 +++++++ include/soc/qcom/qcom-spmi-pmic.h | 1 + 2 files changed, 8 insertions(+)
drivers/mfd/qcom-spmi-pmic.c +7 -0
@@ -19,6 +19,7 @@#define PMIC_REV4 0x103#define PMIC_TYPE 0x104#define PMIC_SUBTYPE 0x105 +#define PMIC_FAB_ID 0x1f2#define PMIC_TYPE_VALUE 0x51
@@ -157,6 +158,12 @@ static int pmic_spmi_load_revid(struct regmap *map, struct device *dev,if (ret <0 )return ret; +if (pmic->subtype ==PMI8998_SUBTYPE || pmic->subtype ==PM660_SUBTYPE ) { + ret =regmap_read (map,PMIC_FAB_ID , &pmic->fab_id); +if (ret <0 ) +return ret; + } +/* * In early versions of PM8941 and PM8226, the major revision number * started incrementing from 0 (eg 0 = v1.0, 1 = v2.0).
include/soc/qcom/qcom-spmi-pmic.h +1 -0
@@ -52,6 +52,7 @@ struct qcom_spmi_pmic {unsigned int major;unsigned int minor;unsigned int rev2; +unsigned int fab_id;const char *name; };
Signature · 1 line
2.36.0
Re: [PATCH v14 03/10] mfd: qcom-spmi-pmic: read fab id on supported PMICs
Quoted 10 lines · Caleb Connolly
The PMI8998 and PM660 expose the
fab_id, this is needed by drivers like the RRADC to calibrate ADC values.Signed-off-by Caleb Connolly <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>Tested-by Dmitry Baryshkov <[email protected]>--- drivers/mfd/qcom-spmi-pmic.c | 7 +++++++ include/soc/qcom/qcom-spmi-pmic.h | 1 + 2 files changed, 8 insertions(+)
Signature · 4 lines
Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v14 4/10 dt-bindings: iio: adc: document qcom-spmi-rradc
In reply to Caleb ConnollyAdd dt-binding docs for the Qualcomm SPMI RRADC found in PMICs like PMI8998 and PMI8994
--- .../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml
Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml new file +51 -0
@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/qcom,spmi-rradc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm's SPMI PMIC Round Robin ADC + +maintainers: + - Caleb Connolly <[email protected]> + +description: | + The Qualcomm SPMI Round Robin ADC (RRADC) provides interface to clients to + read the voltage, current and temperature for supported peripherals such as + the battery thermistor die temperature, charger temperature, USB and DC input + voltage / current and battery ID resistor. + +properties: + compatible: + enum: + - qcom,pmi8998-rradc + - qcom,pm660-rradc + + reg: + maxItems: 1 + + qcom,batt-id-delay-ms: + description: Sets the hardware settling time for the battery ID resistor. + enum: [0, 1, 4, 12, 20, 40, 60, 80] + + "#io-channel-cells": + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + pmic { + #address-cells = <1>; + #size-cells = <0>; + + pmic_rradc: adc@4500 { + compatible = "qcom,pmi8998-rradc"; + reg = <0x4500>; + #io-channel-cells = <1>; + }; + };
Signature · 1 line
2.36.0
Re: [PATCH v14 04/10] dt-bindings: iio: adc: document qcom-spmi-rradc
Quoted 4 lines · Caleb Connolly
Add dt-binding docs for the Qualcomm SPMI RRADC found in PMICs like PMI8998 and PMI8994
Signed-off-by Caleb Connolly <[email protected]>
You got my review tag, didn't you? Any changes in this patch?
Best regards,
Krzysztof
Re: [PATCH v14 04/10] dt-bindings: iio: adc: document qcom-spmi-rradc
Quoted 7 lines · Krzysztof Kozlowski
Quoted 4 lines · Caleb Connolly
Add dt-binding docs for the Qualcomm SPMI RRADC found in PMICs like PMI8998 and PMI8994
Signed-off-by Caleb Connolly <[email protected]>You got my review tag, didn't you? Any changes in this patch?
Yes, I did, and applied your suggestion, apologies I totally forgot to pick it up.
Shall I resend? Or who will be taking this patch? Would they maybe be happy to add it?
Quoted 3 lines
Best regards,
Krzysztof
Signature · 2 lines
Kind Regards, Caleb (they/he)
Re: [PATCH v14 04/10] dt-bindings: iio: adc: document qcom-spmi-rradc
In reply to Caleb ConnollyQuoted 4 lines · Caleb Connolly
Add dt-binding docs for the Qualcomm SPMI RRADC found in PMICs like PMI8998 and PMI8994
Signed-off-by Caleb Connolly <[email protected]>
Best regards,
Krzysztof
Re: [PATCH v14 04/10] dt-bindings: iio: adc: document qcom-spmi-rradc
In reply to Caleb ConnollyQuoted 4 lines · On Fri, 29 Apr 2022 23:08:59 +0100 Caleb Connolly <[email protected]>…
Add dt-binding docs for the Qualcomm SPMI RRADC found in PMICs like PMI8998 and PMI8994
Signed-off-by Caleb Connolly <[email protected]>
#to let Lee pick it up via mfd if he prefers.
Thanks,
Jonathan
Quoted 62 lines
--- .../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yamlDocumentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml new file +51
-0@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/qcom,spmi-rradc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm's SPMI PMIC Round Robin ADC + +maintainers: + - Caleb Connolly <[email protected]> + +description: | + The Qualcomm SPMI Round Robin ADC (RRADC) provides interface to clients to + read the voltage, current and temperature for supported peripherals such as + the battery thermistor die temperature, charger temperature, USB and DC input + voltage / current and battery ID resistor. + +properties: + compatible: + enum: + - qcom,pmi8998-rradc + - qcom,pm660-rradc + + reg: + maxItems: 1 + + qcom,batt-id-delay-ms: + description: Sets the hardware settling time for the battery ID resistor. + enum: [0, 1, 4, 12, 20, 40, 60, 80] + + "#io-channel-cells": + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + pmic { + #address-cells = <1>; + #size-cells = <0>; + + pmic_rradc: adc@4500 { + compatible = "qcom,pmi8998-rradc"; + reg = <0x4500>; + #io-channel-cells = <1>; + }; + };
PATCH v14 5/10 iio: adc: qcom-spmi-rradc: introduce round robin adc
In reply to Caleb ConnollyThe Round Robin ADC is responsible for reading data about the rate of charge from the USB or DC input ports, it can also read the battery ID (resistence), skin temperature and the die temperature of the pmic. It is found on the PMI8998 and PM660 Qualcomm PMICs.
--- drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1021 +++++++++++++++++++++++++++++ 3 files changed, 1034 insertions(+) create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c
drivers/iio/adc/Kconfig +12 -0
@@ -823,6 +823,18 @@ config QCOM_PM8XXX_XOADC To compile this driver as a module, choose M here: the module will be called qcom-pm8xxx-xoadc. +config QCOM_SPMI_RRADC + tristate "Qualcomm SPMI RRADC" + depends on MFD_SPMI_PMIC + help + This is for the PMIC Round Robin ADC driver. + + This driver exposes the battery ID resistor, battery thermal, PMIC die + temperature, charger USB in and DC in voltage and current. + + To compile this driver as a module, choose M here: the module will + be called qcom-qpmi-rradc. + config QCOM_SPMI_IADC tristate "Qualcomm SPMI PMIC current ADC" depends on SPMI
drivers/iio/adc/Makefile +1 -0
@@ -78,6 +78,7 @@ obj-$(CONFIG_NPCM_ADC) += npcm_adc.o obj-$(CONFIG_PALMAS_GPADC) += palmas_gpadc.o obj-$(CONFIG_QCOM_SPMI_ADC5) += qcom-spmi-adc5.o obj-$(CONFIG_QCOM_SPMI_IADC) += qcom-spmi-iadc.o +obj-$(CONFIG_QCOM_SPMI_RRADC) += qcom-spmi-rradc.o obj-$(CONFIG_QCOM_VADC_COMMON) += qcom-vadc-common.o obj-$(CONFIG_QCOM_SPMI_VADC) += qcom-spmi-vadc.o obj-$(CONFIG_QCOM_PM8XXX_XOADC) += qcom-pm8xxx-xoadc.o
drivers/iio/adc/qcom-spmi-rradc.c new file +1021 -0
1,021 lines not on this page · raw message
Signature · 1 line
2.36.0
Jonathan Cameron
maintainerRe: [PATCH v14 05/10] iio: adc: qcom-spmi-rradc: introduce round robin adc
Quoted 6 lines · On Fri, 29 Apr 2022 23:09:00 +0100 Caleb Connolly <[email protected]>…
The Round Robin ADC is responsible for reading data about the rate of charge from the USB or DC input ports, it can also read the battery ID (resistence), skin temperature and the die temperature of the pmic. It is found on the PMI8998 and PM660 Qualcomm PMICs.
Signed-off-by Caleb Connolly <[email protected]>
Hi Caleb,
I took another quick read through of this and noticed that the battery channel is providing on IIO_INFO_RAW but there is code for IIO_INFO_PROCESSED.
Something gone wrong along the way? If all we need is to change it to BIT(IIO_INFO_PROCESSED) I can do that whilst applying or you can do a v15 if you prefer.
Thanks,
Jonathan
Quoted 7 lines
---
drivers/iio/adc/qcom-spmi-rradc.c new file +0
-0
..
drivers/iio/adc/qcom-spmi-rradc.c line 339
Quoted 4 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +4
-0+ +/* +* These functions explicitly cast int64_t to int. +* They will never overflow, as the values are small enough.
See below. I don't think this gets used...
Quoted 36 lines
+ */
drivers/iio/adc/qcom-spmi-rradc.c new file +33
-0+static int rradc_post_process_batt_id (struct rradc_chip *chip,u16 adc_code, +int *result_ohms) +{ +uint32_t current_value; +int64_t r_id; + + current_value = chip->batt_id_data; + r_id = ((int64_t )adc_code *RR_ADC_FS_VOLTAGE_MV ); + r_id =div64_s64 (r_id, (RR_ADC_CHAN_MSB * current_value)); + *result_ohms = (int )(r_id *MILLI ); + +return 0 ; +} + + +static int rradc_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan_spec,int *val, +int *val2,long mask) +{ +struct rradc_chip *chip =iio_priv (indio_dev); +const struct rradc_channel *chan; +int ret; +u16 adc_code; + +if (chan_spec->address >=RR_ADC_CHAN_MAX ) { +dev_err (chip->dev,"Invalid channel index:%lu\n" , + chan_spec->address); +return -EINVAL ; + } + +switch (mask) { +case IIO_CHAN_INFO_SCALE : +return rradc_read_scale (chip, chan_spec->address, val, val2);
drivers/iio/adc/qcom-spmi-rradc.c
Quoted 10 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +10
-0+case IIO_CHAN_INFO_OFFSET : +return rradc_read_offset (chip, chan_spec->address, val); +case IIO_CHAN_INFO_RAW : + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = adc_code; +return IIO_VAL_INT ; +case IIO_CHAN_INFO_PROCESSED :
This doesn't seem to apply to any channels....
Quoted 169 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +169
-0+ chan = &rradc_chans[chan_spec->address]; +if (!chan->scale_fn) +return -EINVAL ; + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = chan->scale_fn (chip, adc_code, val); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +} + +static int rradc_read_label (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,char *label) +{ +return snprintf (label,PAGE_SIZE ,"%s\n" , + rradc_chans[chan->address].label); +} + +static const struct iio_info rradc_info = { + .read_raw = rradc_read_raw, + .read_label = rradc_read_label, +}; + +static const struct rradc_channel rradc_chans[RR_ADC_CHAN_MAX ] = { + { + .label ="batt_id" , + .scale_fn = rradc_post_process_batt_id, + .lsb =RR_ADC_BATT_ID_5_LSB , + .status =RR_ADC_BATT_ID_STS , + .size =6 , + .trigger_addr =RR_ADC_BATT_ID_TRIGGER , + .trigger_mask =BIT (0 ), + }, { + .label ="batt" , + .lsb =RR_ADC_BATT_THERM_LSB , + .status =RR_ADC_BATT_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_BATT_THERM_TRIGGER , + }, { + .label ="pmi8998_skin" , + .lsb =RR_ADC_SKIN_TEMP_LSB , + .status =RR_ADC_AUX_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_AUX_THERM_TRIGGER , + }, { + .label ="usbin_i" , + .lsb =RR_ADC_USB_IN_I_LSB , + .status =RR_ADC_USB_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_I_TRIGGER , + }, { + .label ="usbin_v" , + .lsb =RR_ADC_USB_IN_V_LSB , + .status =RR_ADC_USB_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_V_TRIGGER , + .trigger_mask =BIT (7 ), + }, { + .label ="dcin_i" , + .lsb =RR_ADC_DC_IN_I_LSB , + .status =RR_ADC_DC_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_I_TRIGGER , + }, { + .label ="dcin_v" , + .lsb =RR_ADC_DC_IN_V_LSB , + .status =RR_ADC_DC_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_V_TRIGGER , + }, { + .label ="pmi8998_die" , + .lsb =RR_ADC_PMI_DIE_TEMP_LSB , + .status =RR_ADC_PMI_DIE_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_PMI_DIE_TEMP_TRIGGER , + .trigger_mask =RR_ADC_TRIGGER_EVERY_CYCLE , + }, { + .label ="chg" , + .lsb =RR_ADC_CHARGER_TEMP_LSB , + .status =RR_ADC_CHARGER_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_CHARGER_TEMP_TRIGGER , + }, { + .label ="gpio" , + .lsb =RR_ADC_GPIO_LSB , + .status =RR_ADC_GPIO_STS , + .size =2 , + .trigger_addr =RR_ADC_GPIO_TRIGGER , + }, +}; + +static const struct iio_chan_spec rradc_iio_chans[RR_ADC_CHAN_MAX ] = { + { + .type =IIO_RESISTANCE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_ID , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_THERM , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_SKIN_TEMP , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_I , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_V , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_I , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_V , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_DIE_TEMP , + .channel =2 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_OFFSET ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_CHG_TEMP , + .channel =3 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_GPIO , + .channel =2 , + .indexed =1 , + }, +}; +
Re: [PATCH v14 05/10] iio: adc: qcom-spmi-rradc: introduce round robin adc
Quoted 10 lines · Jonathan Cameron
Quoted 6 lines · On Fri, 29 Apr 2022 23:09:00 +0100 Caleb Connolly <[email protected]>…
The Round Robin ADC is responsible for reading data about the rate of charge from the USB or DC input ports, it can also read the battery ID (resistence), skin temperature and the die temperature of the pmic. It is found on the PMI8998 and PM660 Qualcomm PMICs.
Signed-off-by Caleb Connolly <[email protected]>Hi Caleb,
Hi Jonathan,
Thanks for spotting this, I completely missed it... Yeah this should be IIO_INFO_PROCESSED, the battery ID calculation doesn't fit in the raw/offset/scale format.
Quoted 7 lines
I took another quick read through of this and noticed that the battery channel is providing on
IIO_INFO_RAWbut there is code forIIO_INFO_PROCESSED.Something gone wrong along the way? If all we need is to change it to
BIT(IIO_INFO_PROCESSED)I can do that whilst applying or you can do a v15 if you prefer.
That would be hugely appreciated, thanks a lot.
Quoted 242 lines
Thanks,
Jonathan
Quoted 7 lines
---
drivers/iio/adc/qcom-spmi-rradc.c new file +0
-0..
drivers/iio/adc/qcom-spmi-rradc.c line 339
Quoted 4 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +4
-0+ +/* +* These functions explicitly cast int64_t to int. +* They will never overflow, as the values are small enough. See below. I don't think this gets used...
Quoted 36 lines
+ */
drivers/iio/adc/qcom-spmi-rradc.c new file +33
-0+static int rradc_post_process_batt_id (struct rradc_chip *chip,u16 adc_code, +int *result_ohms) +{ +uint32_t current_value; +int64_t r_id; + + current_value = chip->batt_id_data; + r_id = ((int64_t )adc_code *RR_ADC_FS_VOLTAGE_MV ); + r_id =div64_s64 (r_id, (RR_ADC_CHAN_MSB * current_value)); + *result_ohms = (int )(r_id *MILLI ); + +return 0 ; +} + + +static int rradc_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan_spec,int *val, +int *val2,long mask) +{ +struct rradc_chip *chip =iio_priv (indio_dev); +const struct rradc_channel *chan; +int ret; +u16 adc_code; + +if (chan_spec->address >=RR_ADC_CHAN_MAX ) { +dev_err (chip->dev,"Invalid channel index:%lu\n" , + chan_spec->address); +return -EINVAL ; + } + +switch (mask) { +case IIO_CHAN_INFO_SCALE : +return rradc_read_scale (chip, chan_spec->address, val, val2);drivers/iio/adc/qcom-spmi-rradc.c
Quoted 10 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +10
-0+case IIO_CHAN_INFO_OFFSET : +return rradc_read_offset (chip, chan_spec->address, val); +case IIO_CHAN_INFO_RAW : + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = adc_code; +return IIO_VAL_INT ; +case IIO_CHAN_INFO_PROCESSED :This doesn't seem to apply to any channels....
Quoted 169 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +169
-0+ chan = &rradc_chans[chan_spec->address]; +if (!chan->scale_fn) +return -EINVAL ; + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = chan->scale_fn (chip, adc_code, val); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +} + +static int rradc_read_label (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,char *label) +{ +return snprintf (label,PAGE_SIZE ,"%s\n" , + rradc_chans[chan->address].label); +} + +static const struct iio_info rradc_info = { + .read_raw = rradc_read_raw, + .read_label = rradc_read_label, +}; + +static const struct rradc_channel rradc_chans[RR_ADC_CHAN_MAX ] = { + { + .label ="batt_id" , + .scale_fn = rradc_post_process_batt_id, + .lsb =RR_ADC_BATT_ID_5_LSB , + .status =RR_ADC_BATT_ID_STS , + .size =6 , + .trigger_addr =RR_ADC_BATT_ID_TRIGGER , + .trigger_mask =BIT (0 ), + }, { + .label ="batt" , + .lsb =RR_ADC_BATT_THERM_LSB , + .status =RR_ADC_BATT_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_BATT_THERM_TRIGGER , + }, { + .label ="pmi8998_skin" , + .lsb =RR_ADC_SKIN_TEMP_LSB , + .status =RR_ADC_AUX_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_AUX_THERM_TRIGGER , + }, { + .label ="usbin_i" , + .lsb =RR_ADC_USB_IN_I_LSB , + .status =RR_ADC_USB_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_I_TRIGGER , + }, { + .label ="usbin_v" , + .lsb =RR_ADC_USB_IN_V_LSB , + .status =RR_ADC_USB_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_V_TRIGGER , + .trigger_mask =BIT (7 ), + }, { + .label ="dcin_i" , + .lsb =RR_ADC_DC_IN_I_LSB , + .status =RR_ADC_DC_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_I_TRIGGER , + }, { + .label ="dcin_v" , + .lsb =RR_ADC_DC_IN_V_LSB , + .status =RR_ADC_DC_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_V_TRIGGER , + }, { + .label ="pmi8998_die" , + .lsb =RR_ADC_PMI_DIE_TEMP_LSB , + .status =RR_ADC_PMI_DIE_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_PMI_DIE_TEMP_TRIGGER , + .trigger_mask =RR_ADC_TRIGGER_EVERY_CYCLE , + }, { + .label ="chg" , + .lsb =RR_ADC_CHARGER_TEMP_LSB , + .status =RR_ADC_CHARGER_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_CHARGER_TEMP_TRIGGER , + }, { + .label ="gpio" , + .lsb =RR_ADC_GPIO_LSB , + .status =RR_ADC_GPIO_STS , + .size =2 , + .trigger_addr =RR_ADC_GPIO_TRIGGER , + }, +}; + +static const struct iio_chan_spec rradc_iio_chans[RR_ADC_CHAN_MAX ] = { + { + .type =IIO_RESISTANCE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_ID , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_THERM , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_SKIN_TEMP , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_I , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_V , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_I , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_V , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_DIE_TEMP , + .channel =2 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_OFFSET ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_CHG_TEMP , + .channel =3 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_GPIO , + .channel =2 , + .indexed =1 , + }, +}; +
Signature · 2 lines
Kind Regards, Caleb (they/he)
Re: [PATCH v14 05/10] iio: adc: qcom-spmi-rradc: introduce round robin adc
Quoted 17 lines · On Mon, 9 May 2022 12:53:12 +0100 Caleb Connolly <[email protected]>…
Quoted 10 lines · Jonathan Cameron
Quoted 6 lines · On Fri, 29 Apr 2022 23:09:00 +0100 Caleb Connolly <[email protected]>…
The Round Robin ADC is responsible for reading data about the rate of charge from the USB or DC input ports, it can also read the battery ID (resistence), skin temperature and the die temperature of the pmic. It is found on the PMI8998 and PM660 Qualcomm PMICs.
Signed-off-by Caleb Connolly <[email protected]>Hi Caleb,
Hi Jonathan,
Thanks for spotting this, I completely missed it... Yeah this should be
IIO_INFO_PROCESSED, the battery ID calculation doesn't fit in the raw/offset/scale format.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
I took another quick read through of this and noticed that the battery channel is providing on
IIO_INFO_RAWbut there is code forIIO_INFO_PROCESSED.Something gone wrong along the way? If all we need is to change it to
BIT(IIO_INFO_PROCESSED)I can do that whilst applying or you can do a v15 if you prefer.That would be hugely appreciated, thanks a lot.
Quoted 1 line
Given other reply I just sent suggesting you do a v15 and Lee might want to just pick up the series, with above fixed.
Either way works as long as there is an immutable branch somewhere.
Thanks,
Jonathan
Quoted 242 lines
Quoted 241 lines
Thanks,
Jonathan
Quoted 7 lines
---
drivers/iio/adc/qcom-spmi-rradc.c new file +0
-0..
drivers/iio/adc/qcom-spmi-rradc.c line 339
Quoted 4 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +4
-0+ +/* +* These functions explicitly cast int64_t to int. +* They will never overflow, as the values are small enough. See below. I don't think this gets used...
Quoted 36 lines
+ */
drivers/iio/adc/qcom-spmi-rradc.c new file +33
-0+static int rradc_post_process_batt_id (struct rradc_chip *chip,u16 adc_code, +int *result_ohms) +{ +uint32_t current_value; +int64_t r_id; + + current_value = chip->batt_id_data; + r_id = ((int64_t )adc_code *RR_ADC_FS_VOLTAGE_MV ); + r_id =div64_s64 (r_id, (RR_ADC_CHAN_MSB * current_value)); + *result_ohms = (int )(r_id *MILLI ); + +return 0 ; +} + + +static int rradc_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan_spec,int *val, +int *val2,long mask) +{ +struct rradc_chip *chip =iio_priv (indio_dev); +const struct rradc_channel *chan; +int ret; +u16 adc_code; + +if (chan_spec->address >=RR_ADC_CHAN_MAX ) { +dev_err (chip->dev,"Invalid channel index:%lu\n" , + chan_spec->address); +return -EINVAL ; + } + +switch (mask) { +case IIO_CHAN_INFO_SCALE : +return rradc_read_scale (chip, chan_spec->address, val, val2);drivers/iio/adc/qcom-spmi-rradc.c
Quoted 10 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +10
-0+case IIO_CHAN_INFO_OFFSET : +return rradc_read_offset (chip, chan_spec->address, val); +case IIO_CHAN_INFO_RAW : + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = adc_code; +return IIO_VAL_INT ; +case IIO_CHAN_INFO_PROCESSED :This doesn't seem to apply to any channels....
Quoted 169 lines
drivers/iio/adc/qcom-spmi-rradc.c new file +169
-0+ chan = &rradc_chans[chan_spec->address]; +if (!chan->scale_fn) +return -EINVAL ; + ret =rradc_do_conversion (chip, chan_spec->address, &adc_code); +if (ret <0 ) +return ret; + + *val = chan->scale_fn (chip, adc_code, val); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +} + +static int rradc_read_label (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,char *label) +{ +return snprintf (label,PAGE_SIZE ,"%s\n" , + rradc_chans[chan->address].label); +} + +static const struct iio_info rradc_info = { + .read_raw = rradc_read_raw, + .read_label = rradc_read_label, +}; + +static const struct rradc_channel rradc_chans[RR_ADC_CHAN_MAX ] = { + { + .label ="batt_id" , + .scale_fn = rradc_post_process_batt_id, + .lsb =RR_ADC_BATT_ID_5_LSB , + .status =RR_ADC_BATT_ID_STS , + .size =6 , + .trigger_addr =RR_ADC_BATT_ID_TRIGGER , + .trigger_mask =BIT (0 ), + }, { + .label ="batt" , + .lsb =RR_ADC_BATT_THERM_LSB , + .status =RR_ADC_BATT_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_BATT_THERM_TRIGGER , + }, { + .label ="pmi8998_skin" , + .lsb =RR_ADC_SKIN_TEMP_LSB , + .status =RR_ADC_AUX_THERM_STS , + .size =2 , + .trigger_addr =RR_ADC_AUX_THERM_TRIGGER , + }, { + .label ="usbin_i" , + .lsb =RR_ADC_USB_IN_I_LSB , + .status =RR_ADC_USB_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_I_TRIGGER , + }, { + .label ="usbin_v" , + .lsb =RR_ADC_USB_IN_V_LSB , + .status =RR_ADC_USB_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_USB_IN_V_TRIGGER , + .trigger_mask =BIT (7 ), + }, { + .label ="dcin_i" , + .lsb =RR_ADC_DC_IN_I_LSB , + .status =RR_ADC_DC_IN_I_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_I_TRIGGER , + }, { + .label ="dcin_v" , + .lsb =RR_ADC_DC_IN_V_LSB , + .status =RR_ADC_DC_IN_V_STS , + .size =2 , + .trigger_addr =RR_ADC_DC_IN_V_TRIGGER , + }, { + .label ="pmi8998_die" , + .lsb =RR_ADC_PMI_DIE_TEMP_LSB , + .status =RR_ADC_PMI_DIE_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_PMI_DIE_TEMP_TRIGGER , + .trigger_mask =RR_ADC_TRIGGER_EVERY_CYCLE , + }, { + .label ="chg" , + .lsb =RR_ADC_CHARGER_TEMP_LSB , + .status =RR_ADC_CHARGER_TEMP_STS , + .size =2 , + .trigger_addr =RR_ADC_CHARGER_TEMP_TRIGGER , + }, { + .label ="gpio" , + .lsb =RR_ADC_GPIO_LSB , + .status =RR_ADC_GPIO_STS , + .size =2 , + .trigger_addr =RR_ADC_GPIO_TRIGGER , + }, +}; + +static const struct iio_chan_spec rradc_iio_chans[RR_ADC_CHAN_MAX ] = { + { + .type =IIO_RESISTANCE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_ID , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =RR_ADC_BATT_THERM , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_SKIN_TEMP , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_I , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_USBIN_V , + .channel =0 , + .indexed =1 , + }, { + .type =IIO_CURRENT , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_I , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_DCIN_V , + .channel =1 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .address =RR_ADC_DIE_TEMP , + .channel =2 , + .indexed =1 , + }, { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_OFFSET ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_CHG_TEMP , + .channel =3 , + .indexed =1 , + }, { + .type =IIO_VOLTAGE , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ), + .address =RR_ADC_GPIO , + .channel =2 , + .indexed =1 , + }, +}; +
PATCH v14 6/10 arm64: dts: qcom: pmi8998: add rradc node
In reply to Caleb ConnollyAdd a DT node for the Round Robin ADC found in the PMI8998 PMIC.
--- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/pmi8998.dtsi +8 -0
@@ -18,6 +18,14 @@ pmi8998_gpio: gpios@c000 { interrupt-controller; #interrupt-cells = <2>; }; + + pmi8998_rradc: rradc@4500 { + compatible = "qcom,pmi8998-rradc"; + reg = <0x4500>; + #io-channel-cells = <1>; + + status = "disabled"; + }; }; pmi8998_lsid1: pmic@3 {
Signature · 1 line
2.36.0
PATCH v14 7/10 arm64: dts: qcom: sdm845-oneplus: enable rradc
In reply to Caleb ConnollyEnable the RRADC for the OnePlus 6.
--- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +4 -0
@@ -461,6 +461,10 @@ pinconf { }; }; +&pmi8998_rradc { + status = "okay"; +}; + &qupv3_id_1 { status = "okay"; };
Signature · 1 line
2.36.0
PATCH v14 8/10 arm64: dts: qcom: sdm845-db845c: enable rradc
In reply to Caleb ConnollyEnable the Round Robin ADC for the db845c.
--- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sdm845-db845c.dts +4 -0
@@ -599,6 +599,10 @@ resin { }; }; +&pmi8998_rradc { + status = "okay"; +}; + /* QUAT I2S Uses 4 I2S SD Lines for audio on LT9611 HDMI Bridge */ &q6afedai { qi2s@22 {
Signature · 1 line
2.36.0
PATCH v14 9/10 arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradc
In reply to Caleb ConnollyEnable the PMI8998 RRADC.
--- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +4 -0
@@ -312,6 +312,10 @@ resin { }; }; +&pmi8998_rradc { + status = "okay"; +}; + /* QUAT I2S Uses 1 I2S SD Line for audio on TAS2559/60 amplifiers */ &q6afedai { qi2s@22 {
Signature · 1 line
2.36.0
PATCH v14 10/10 arm64: dts: qcom: msm8998-oneplus-common: enable RRADC
In reply to Caleb ConnollyFrom: Jami Kettunen <[email protected]>
Enable the Round Robin ADC for the OnePlus 5/5T.
--- arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi +4 -0
@@ -257,6 +257,10 @@ pinconf { }; }; +&pmi8998_rradc { + status = "okay"; +}; + &qusb2phy { status = "okay";
Signature · 1 line
2.36.0
Jonathan Cameron
maintainerQuoted 13 lines · On Fri, 29 Apr 2022 23:08:55 +0100 Caleb Connolly <[email protected]>…
The RRADC is responsible for reading data about the current and voltage from the USB or DC in jacks, it can also read the battery ID (resistence) and some temperatures. It is found on the PMI8998 and PM660 Qualcomm PMICs.
The RRADC has to calibrate some ADC values based on which chip fab the PMIC was produced in, to facilitate this the patches ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") and ("mfd: qcom-spmi-pmic: read fab id on supported PMICs") expose the PMIC revision information and
fab_idas a struct and register them as driver data in the Qualcomm SPMI PMIC driver so that it can be read by the RRADC.
Quoted 4 lines
The first 3 patches add support for looking up an SPMI device from a struct
device_node, as well as introducing support for looking up the base USID of a Qcom PMIC, see patch comments for more details. These Address Bjorns comments on v2.
Hi Caleb / All
Rather than waste time going for a v15 for the 3 minor issues in reviews I've just fixed them up whilst applying.
As spmi or mfd maintainers may want an immutable branch I've
just pushed one out at
https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git immutable-qcom-spmi-rradc that has the first 5 patches. I assume the dts changes will go via qcom -> arm-soc as normal.
0-day should run on that branch shortly but I'll be optimistic and pull it into my testing branch in the meantime (mostly so I don't forget about it and can mark it applied in patchwork :)
Thanks,
Jonathan
Quoted 100 lines
Changes since v13:
* Address Lee Jones' feedback on the SPMI patches.
* Pick up Jami's patch to enable the RRADC on the OnePlus 5Changes since v12:
* Apply Krzysztof's suggestions to rradc DT binding docs.Changes since v11:
* Remove debug logging which was left in ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients")
* Picked up Dmitry's Tested-by and Reviewed-by tags.Changes since v10:
* Don't inlinespmi_device_from_of()Changes since v9:
* Add back missing copyright, this driver is originally derived from downstream (Thanks Manivannan).Changes since v8:
* Drop Reported-by for the bugfix on previous revision reported by LKP
* Apply Jonathans suggestions
* Rework patch 2 ("expose the PMIC revid information to clients") to handle PMICs with a single USID (thanks Dmitry)Changes since v7:
* Addressed Jonathans comments
* Fixed bug reported by LKPChanges since v6:
* Fix printf format warning in rradcChanges since v5:
* Add missingEXPORT_SYMBOL_GPL()to
("spmi: add a helper to look up an SPMI device from a device node")Changes since v4:
* Addressed Jonathan's comments on v4
* Reworked the qcom-spmi-pmic patches to properly walk the devicetree to find the base USID. I've tested this on SDM845 which has two PMICs (pm8998 and pmi8998) and I'm able to look up the PMIC revid from all 4 USIDs.Changes since v3:
* Split PMIC patch in two, rework to support function drivers on a sibling USID
* Completely rework RRADC driver to make use of the modern IIO framework. This required re-arranging a lot of the equations and results in some lost precision, where relevant I've left comments to explain this. I don't think any of it is significant enough to justify doing post-processing in driver.
Thanks a lot Jonathan and John Stultz for helping me out with thisChanges since v2:
* Add missing include (thanks kernel test robot :D)
* Rework some confusing function return values, specificallyrradc_read_status_in_cont_modeandrradc_prepare_batt_id_conversionboth of which didn't correctly handle "ret". This also bought up an issue as the previous implementation didn't actually wait for the channel to be ready. It doesn't seem like that's strictly necessary (same data is reported if I wait for the status to be good or not) but I've included it anyway for good measure.Changes since v1:
* Rework the RRADC driver based on Jonathan's feedback
* Pick up Rob's reviewed by for the dt-binding patch.
---
Caleb Connolly (9):
spmi: add a helper to look up an SPMI device from a device node
mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
mfd: qcom-spmi-pmic: read fab id on supported PMICs
dt-bindings: iio: adc: document qcom-spmi-rradc
iio: adc: qcom-spmi-rradc: introduce round robin adc
arm64: dts: qcom: pmi8998: add rradc node
arm64: dts: qcom: sdm845-oneplus: enable rradc
arm64: dts: qcom: sdm845-db845c: enable rradc
arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradcJami Kettunen (1):
arm64: dts: qcom: msm8998-oneplus-common: enable RRADC.../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 + .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 + drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1021 +++++++++++++++++ drivers/mfd/qcom-spmi-pmic.c | 272 +++-- drivers/spmi/spmi.c | 17 + include/linux/spmi.h | 3 + include/soc/qcom/qcom-spmi-pmic.h | 61 + 13 files changed, 1372 insertions(+), 90 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
Jonathan Cameron
maintainerQuoted 32 lines · On Sat, 18 Jun 2022 14:09:13 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 13 lines · On Fri, 29 Apr 2022 23:08:55 +0100 Caleb Connolly <[email protected]>…
The RRADC is responsible for reading data about the current and voltage from the USB or DC in jacks, it can also read the battery ID (resistence) and some temperatures. It is found on the PMI8998 and PM660 Qualcomm PMICs.
The RRADC has to calibrate some ADC values based on which chip fab the PMIC was produced in, to facilitate this the patches ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") and ("mfd: qcom-spmi-pmic: read fab id on supported PMICs") expose the PMIC revision information and
fab_idas a struct and register them as driver data in the Qualcomm SPMI PMIC driver so that it can be read by the RRADC.Quoted 4 lines
The first 3 patches add support for looking up an SPMI device from a struct
device_node, as well as introducing support for looking up the base USID of a Qcom PMIC, see patch comments for more details. These Address Bjorns comments on v2.Hi Caleb / All
Rather than waste time going for a v15 for the 3 minor issues in reviews I've just fixed them up whilst applying.
As spmi or mfd maintainers may want an immutable branch I've
just pushed one out at
https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git immutable-qcom-spmi-rradc that has the first 5 patches. I assume the dts changes will go via qcom -> arm-soc as normal.
Quoted 3 lines
0-day should run on that branch shortly but I'll be optimistic and pull it into my testing branch in the meantime (mostly so I don't forget about it and can mark it applied in patchwork :)
Gah. Merge into IIO doesn't build because of dropping of.h from includes in iio.h. This driver should directly include property.h directly.
New 'immutable' branch with same name pushed out. Guessing no one picked it up in the minute or so previous version was available for!
I'd advise that Lee / Stephen don't merge this for a few days at least so any other issues have become visible and I can fix them up without making for complex history.
Thanks,
Jonathan
Quoted 107 lines
Thanks,
Jonathan
Quoted 100 lines
Changes since v13:
* Address Lee Jones' feedback on the SPMI patches.
* Pick up Jami's patch to enable the RRADC on the OnePlus 5Changes since v12:
* Apply Krzysztof's suggestions to rradc DT binding docs.Changes since v11:
* Remove debug logging which was left in ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients")
* Picked up Dmitry's Tested-by and Reviewed-by tags.Changes since v10:
* Don't inlinespmi_device_from_of()Changes since v9:
* Add back missing copyright, this driver is originally derived from downstream (Thanks Manivannan).Changes since v8:
* Drop Reported-by for the bugfix on previous revision reported by LKP
* Apply Jonathans suggestions
* Rework patch 2 ("expose the PMIC revid information to clients") to handle PMICs with a single USID (thanks Dmitry)Changes since v7:
* Addressed Jonathans comments
* Fixed bug reported by LKPChanges since v6:
* Fix printf format warning in rradcChanges since v5:
* Add missingEXPORT_SYMBOL_GPL()to
("spmi: add a helper to look up an SPMI device from a device node")Changes since v4:
* Addressed Jonathan's comments on v4
* Reworked the qcom-spmi-pmic patches to properly walk the devicetree to find the base USID. I've tested this on SDM845 which has two PMICs (pm8998 and pmi8998) and I'm able to look up the PMIC revid from all 4 USIDs.Changes since v3:
* Split PMIC patch in two, rework to support function drivers on a sibling USID
* Completely rework RRADC driver to make use of the modern IIO framework. This required re-arranging a lot of the equations and results in some lost precision, where relevant I've left comments to explain this. I don't think any of it is significant enough to justify doing post-processing in driver.
Thanks a lot Jonathan and John Stultz for helping me out with thisChanges since v2:
* Add missing include (thanks kernel test robot :D)
* Rework some confusing function return values, specificallyrradc_read_status_in_cont_modeandrradc_prepare_batt_id_conversionboth of which didn't correctly handle "ret". This also bought up an issue as the previous implementation didn't actually wait for the channel to be ready. It doesn't seem like that's strictly necessary (same data is reported if I wait for the status to be good or not) but I've included it anyway for good measure.Changes since v1:
* Rework the RRADC driver based on Jonathan's feedback
* Pick up Rob's reviewed by for the dt-binding patch.
---
Caleb Connolly (9):
spmi: add a helper to look up an SPMI device from a device node
mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
mfd: qcom-spmi-pmic: read fab id on supported PMICs
dt-bindings: iio: adc: document qcom-spmi-rradc
iio: adc: qcom-spmi-rradc: introduce round robin adc
arm64: dts: qcom: pmi8998: add rradc node
arm64: dts: qcom: sdm845-oneplus: enable rradc
arm64: dts: qcom: sdm845-db845c: enable rradc
arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradcJami Kettunen (1):
arm64: dts: qcom: msm8998-oneplus-common: enable RRADC.../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 + .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 + drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1021 +++++++++++++++++ drivers/mfd/qcom-spmi-pmic.c | 272 +++-- drivers/spmi/spmi.c | 17 + include/linux/spmi.h | 3 + include/soc/qcom/qcom-spmi-pmic.h | 61 + 13 files changed, 1372 insertions(+), 90 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
Quoted 42 lines · Jonathan Cameron
Quoted 32 lines · On Sat, 18 Jun 2022 14:09:13 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 13 lines · On Fri, 29 Apr 2022 23:08:55 +0100 Caleb Connolly <[email protected]>…
The RRADC is responsible for reading data about the current and voltage from the USB or DC in jacks, it can also read the battery ID (resistence) and some temperatures. It is found on the PMI8998 and PM660 Qualcomm PMICs.
The RRADC has to calibrate some ADC values based on which chip fab the PMIC was produced in, to facilitate this the patches ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") and ("mfd: qcom-spmi-pmic: read fab id on supported PMICs") expose the PMIC revision information and
fab_idas a struct and register them as driver data in the Qualcomm SPMI PMIC driver so that it can be read by the RRADC.Quoted 4 lines
The first 3 patches add support for looking up an SPMI device from a struct
device_node, as well as introducing support for looking up the base USID of a Qcom PMIC, see patch comments for more details. These Address Bjorns comments on v2.Hi Caleb / All
Rather than waste time going for a v15 for the 3 minor issues in reviews I've just fixed them up whilst applying.
As spmi or mfd maintainers may want an immutable branch I've
just pushed one out at
https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git immutable-qcom-spmi-rradc that has the first 5 patches. I assume the dts changes will go via qcom -> arm-soc as normal.Quoted 3 lines
0-day should run on that branch shortly but I'll be optimistic and pull it into my testing branch in the meantime (mostly so I don't forget about it and can mark it applied in patchwork :)
Gah. Merge into IIO doesn't build because of dropping
of.hfrom includes iniio.h. This driver should directly includeproperty.hdirectly.
Quoted 6 lines
New 'immutable' branch with same name pushed out. Guessing no one picked it up in the minute or so previous version was available for!
I'd advise that Lee / Stephen don't merge this for a few days at least so any other issues have become visible and I can fix them up without making for complex history.
Hi Jonathan,
Thanks so much for picking this up and fixing those last few issues. And thanks for all your help with this series, I really appreciate the time you've taken to help me get this to a mergeable state and teach me about IIO.
You've really made my week with this :)
Kind Regards,
Caleb
Quoted 113 lines
Thanks,
Jonathan
Quoted 107 lines
Thanks,
Jonathan
Quoted 100 lines
Changes since v13:
* Address Lee Jones' feedback on the SPMI patches.
* Pick up Jami's patch to enable the RRADC on the OnePlus 5Changes since v12:
* Apply Krzysztof's suggestions to rradc DT binding docs.Changes since v11:
* Remove debug logging which was left in ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients")
* Picked up Dmitry's Tested-by and Reviewed-by tags.Changes since v10:
* Don't inlinespmi_device_from_of()Changes since v9:
* Add back missing copyright, this driver is originally derived from downstream (Thanks Manivannan).Changes since v8:
* Drop Reported-by for the bugfix on previous revision reported by LKP
* Apply Jonathans suggestions
* Rework patch 2 ("expose the PMIC revid information to clients") to handle PMICs with a single USID (thanks Dmitry)Changes since v7:
* Addressed Jonathans comments
* Fixed bug reported by LKPChanges since v6:
* Fix printf format warning in rradcChanges since v5:
* Add missingEXPORT_SYMBOL_GPL()to
("spmi: add a helper to look up an SPMI device from a device node")Changes since v4:
* Addressed Jonathan's comments on v4
* Reworked the qcom-spmi-pmic patches to properly walk the devicetree to find the base USID. I've tested this on SDM845 which has two PMICs (pm8998 and pmi8998) and I'm able to look up the PMIC revid from all 4 USIDs.Changes since v3:
* Split PMIC patch in two, rework to support function drivers on a sibling USID
* Completely rework RRADC driver to make use of the modern IIO framework. This required re-arranging a lot of the equations and results in some lost precision, where relevant I've left comments to explain this. I don't think any of it is significant enough to justify doing post-processing in driver.
Thanks a lot Jonathan and John Stultz for helping me out with thisChanges since v2:
* Add missing include (thanks kernel test robot :D)
* Rework some confusing function return values, specificallyrradc_read_status_in_cont_modeandrradc_prepare_batt_id_conversionboth of which didn't correctly handle "ret". This also bought up an issue as the previous implementation didn't actually wait for the channel to be ready. It doesn't seem like that's strictly necessary (same data is reported if I wait for the status to be good or not) but I've included it anyway for good measure.Changes since v1:
* Rework the RRADC driver based on Jonathan's feedback
* Pick up Rob's reviewed by for the dt-binding patch.
---
Caleb Connolly (9):
spmi: add a helper to look up an SPMI device from a device node
mfd: qcom-spmi-pmic: expose the PMIC revid information to clients
mfd: qcom-spmi-pmic: read fab id on supported PMICs
dt-bindings: iio: adc: document qcom-spmi-rradc
iio: adc: qcom-spmi-rradc: introduce round robin adc
arm64: dts: qcom: pmi8998: add rradc node
arm64: dts: qcom: sdm845-oneplus: enable rradc
arm64: dts: qcom: sdm845-db845c: enable rradc
arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradcJami Kettunen (1):
arm64: dts: qcom: msm8998-oneplus-common: enable RRADC.../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 + .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 + drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1021 +++++++++++++++++ drivers/mfd/qcom-spmi-pmic.c | 272 +++-- drivers/spmi/spmi.c | 17 + include/linux/spmi.h | 3 + include/soc/qcom/qcom-spmi-pmic.h | 61 + 13 files changed, 1372 insertions(+), 90 deletions(-)create mode 100644
Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yamlcreate mode 100644drivers/iio/adc/qcom-spmi-rradc.c
create mode 100644include/soc/qcom/qcom-spmi-pmic.h