Message ID | 20200903132109.1914011-1-dmitry.baryshkov@linaro.org |
---|---|
Headers | show |
Series | qcom: pm8150: add support for thermal monitoring | expand |
On Thu, 03 Sep 2020 16:21:01 +0300, Dmitry Baryshkov wrote: > Add bindings for thermal monitor, part of Qualcomm PMIC5 chips. It is a > close counterpart of VADC part of those PMICs. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 142 ++++++++++++++++++ > 1 file changed, 142 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > My bot found errors running 'make dt_binding_check' on your patch: Error: Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.example.dts:23.24-25 syntax error FATAL ERROR: Unable to parse input tree make[1]: *** [scripts/Makefile.lib:342: Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1366: dt_binding_check] Error 2 See https://patchwork.ozlabs.org/patch/1356633 If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date: pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade Please check and re-submit.
On 0903, Dmitry Baryshkov wrote: > Use of_device_get_match_data() instead of hand-coding it manually. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/iio/adc/qcom-spmi-adc5.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c > index c2da8f068b87..0ac0b81bab7d 100644 > --- a/drivers/iio/adc/qcom-spmi-adc5.c > +++ b/drivers/iio/adc/qcom-spmi-adc5.c > @@ -14,6 +14,7 @@ > #include <linux/math64.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/slab.h> > @@ -807,8 +808,6 @@ static int adc5_get_dt_data(struct adc5_chip *adc, struct device_node *node) > struct adc5_channel_prop prop, *chan_props; > struct device_node *child; > unsigned int index = 0; > - const struct of_device_id *id; > - const struct adc5_data *data; > int ret; > > adc->nchannels = of_get_available_child_count(node); > @@ -827,24 +826,19 @@ static int adc5_get_dt_data(struct adc5_chip *adc, struct device_node *node) > > chan_props = adc->chan_props; > iio_chan = adc->iio_chans; > - id = of_match_node(adc5_match_table, node); > - if (id) > - data = id->data; > - else > - data = &adc5_data_pmic; > - adc->data = data; > + adc->data = of_device_get_match_data(adc->dev); I think you're missing the else condition to fallback to default dev data incase the device is not part of of_device_id. Thanks, Mani > > for_each_available_child_of_node(node, child) { > - ret = adc5_get_dt_channel_data(adc, &prop, child, data); > + ret = adc5_get_dt_channel_data(adc, &prop, child, adc->data); > if (ret) { > of_node_put(child); > return ret; > } > > prop.scale_fn_type = > - data->adc_chans[prop.channel].scale_fn_type; > + adc->data->adc_chans[prop.channel].scale_fn_type; > *chan_props = prop; > - adc_chan = &data->adc_chans[prop.channel]; > + adc_chan = &adc->data->adc_chans[prop.channel]; > > iio_chan->channel = prop.channel; > iio_chan->datasheet_name = prop.datasheet_name; > -- > 2.28.0 >
On Thu, 3 Sep 2020 16:21:01 +0300 Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > Add bindings for thermal monitor, part of Qualcomm PMIC5 chips. It is a > close counterpart of VADC part of those PMICs. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 142 ++++++++++++++++++ > 1 file changed, 142 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > > diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > new file mode 100644 > index 000000000000..94aaf3720b9f > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > @@ -0,0 +1,142 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/thermal/qcom-spmi-adc-tm5.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm's SPMI PMIC ADC-TM > +maintainers: > + - Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > + > +properties: > + compatible: > + const: qcom,spmi-adc-tm5 > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + "#thermal-sensor-cells": > + const: 1 > + description: > + Number of cells required to uniquely identify the thermal sensors. Since > + we have multiple sensors this is set to 1 > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > + io-channels: > + description: > + From common IIO binding. Used to pipe PMIC ADC channel to thermal monitor > + > + io-channel-names: > + description: > + From common IIO binding. Names each of IIO channels. The name should > + be equal to the sensor's subnode name. > + > + qcom,avg-samples: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: Number of samples to be used for measurement. > + enum: > + - 1 > + - 2 > + - 4 > + - 8 > + - 16 > + default: 1 > + > + qcom,decimation: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: This parameter is used to decrease ADC sampling rate. Just curious, but how is it used? What do 250, 420 etc actually refer to? > + enum: > + - 250 > + - 420 > + - 840 > + default: 840 > + > +patternProperties: > + "^([-a-z0-9]*)@[0-9]+$": > + type: object > + description: > + Represent one thermal sensor. > + > + properties: > + reg: > + description: Specify the sensor channel. > + maxItems: 1 > + > + qcom,adc-channel: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: Corresponding ADC channel ID. Comment down at the example. > + > + qcom,ratiometric: > + $ref: /schemas/types.yaml#/definitions/flag > + description: > + Channel calibration type. > + If this property is specified VADC will use the VDD reference > + (1.875V) and GND for channel calibration. If property is not found, > + channel will be calibrated with 0V and 1.25V reference channels, > + also known as absolute calibration. > + > + qcom,hw-settle-time: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: Time between AMUX getting configured and the ADC starting conversion. > + > + qcom,pre-scaling: > + $ref: /schemas/types.yaml#/definitions/uint32-array > + description: Used for scaling the channel input signal before the signal is fed to VADC. See qcom,spi-vadc specification for the list of possible values. Very long line. > + minItems: 2 > + maxItems: 2 > + > + required: > + - reg > + - qcom,adc-channel > + > + additionalProperties: > + false > + > +required: > + - compatible > + - reg > + - interrupts > + - "#address-cells" > + - "#size-cells" > + - "#thermal-sensor-cells" > + > +additionalProperties: false > + > +examples: > + - | > + pm8150b_adc: adc@3100 { > + compatible = "qcom,spmi-adc5"; > + /* Other propreties are omitted */ > + conn-therm@4f { > + reg = <ADC5_AMUX_THM3_100K_PU>; > + qcom,ratiometric; > + qcom,hw-settle-time = <200>; > + }; > + }; > + > + pm8150b_adc_tm: adc-tm@3500 { > + compatible = "qcom,spmi-adc-tm5"; > + reg = <0x3500>; > + interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>; > + #thermal-sensor-cells = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + io-channels = <&pm8150b_adc ADC5_AMUX_THM3_100K_PU>; > + io-channel-names = "conn-therm"; > + > + conn-therm@0 { > + reg = <0>; > + qcom,adc-channel = <ADC5_AMUX_THM3_100K_PU>; Would we be better off putting the io-channels entry directly in the child and lose the indirection? Would make the driver a bit more fiddly perhaps but give a more elegant binding by dropping one level of indirection /repetition. > + qcom,ratiometric; > + qcom,hw-settle-time = <200>; > + }; > + }; > +...