| Message ID | 278b59d6a25f874a087995368cecec2572b5be89.1531135999.git.amit.kucheria@linaro.org |
|---|---|
| State | Accepted |
| Commit | 191dc74bad60e1462094b2e25321479e7eb17cdc |
| Headers | show |
| Series | [v6,1/7] thermal: tsens: Get rid of unused fields in structure | expand |
On Thu, Jul 12, 2018 at 12:10 AM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Mon, Jul 9, 2018 at 4:43 AM, Amit Kucheria <amit.kucheria@linaro.org> wrote: > > SDM845 uses v2 of the TSENS IP block but the get_temp() function > > appears to be identical across v2.x.y in code seen so far. We use the > > generic get_temp() function defined as part of ops_generic_v2. > > > > Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> > > --- > > drivers/thermal/qcom/tsens-v2.c | 6 +++++- > > drivers/thermal/qcom/tsens.c | 3 +++ > > drivers/thermal/qcom/tsens.h | 5 ++++- > > 3 files changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c > > index 34ba6c7..f40150f 100644 > > --- a/drivers/thermal/qcom/tsens-v2.c > > +++ b/drivers/thermal/qcom/tsens-v2.c > > @@ -69,8 +69,12 @@ static const struct tsens_ops ops_generic_v2 = { > > .get_temp = get_temp_tsens_v2, > > }; > > > > +const struct tsens_data data_tsens_v2 = { > > + .ops = &ops_generic_v2, > > +}; > > + > > +/* Kept around for backward compatibility with old msm8996.dtsi */ > > const struct tsens_data data_8996 = { > > .num_sensors = 13, > > .ops = &ops_generic_v2, > > }; > > Something seems fishy here. You have a ".num_sensors" for sdm8996 > hardcoded to 13 but you don't have a ".num_sensors" for your new v2. > Where does num_sensors get set for everyone else? In patch #3 you > have a new "#qcom,sensors" but: > > 1. Nothing reads this as far as I can tell, so that means everyone > will end up with 0 sensors. > > 2. On your 2nd block of sensors in the sdm8996 device tree (see > earlier patch in the series) you try to set qcom,sensors to 8. ...but > since you still have a compatible of "qcom,msm8996-tsens" you'll get > 13. That seems wrong. ...or did I miss something? Refer to commit 6d7c70d1cd6 (thermal: qcom: tsens: Allow number of sensors to come from DT) merged earlier. #qcom,sensors will override the platform data if defined.
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 34ba6c7..f40150f 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -69,8 +69,12 @@ static const struct tsens_ops ops_generic_v2 = { .get_temp = get_temp_tsens_v2, }; +const struct tsens_data data_tsens_v2 = { + .ops = &ops_generic_v2, +}; + +/* Kept around for backward compatibility with old msm8996.dtsi */ const struct tsens_data data_8996 = { .num_sensors = 13, .ops = &ops_generic_v2, }; - diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 3440166c..a2c9bfa 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -72,6 +72,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996, + }, { + .compatible = "qcom,tsens-v2", + .data = &data_tsens_v2, }, {} }; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index d785b37..14331eb 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -88,6 +88,9 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32); int init_common(struct tsens_device *); int get_temp_common(struct tsens_device *, int, int *); -extern const struct tsens_data data_8916, data_8974, data_8960, data_8996; +/* TSENS v1 targets */ +extern const struct tsens_data data_8916, data_8974, data_8960; +/* TSENS v2 targets */ +extern const struct tsens_data data_8996, data_tsens_v2; #endif /* __QCOM_TSENS_H__ */
SDM845 uses v2 of the TSENS IP block but the get_temp() function appears to be identical across v2.x.y in code seen so far. We use the generic get_temp() function defined as part of ops_generic_v2. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> --- drivers/thermal/qcom/tsens-v2.c | 6 +++++- drivers/thermal/qcom/tsens.c | 3 +++ drivers/thermal/qcom/tsens.h | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) -- 2.7.4