| Message ID | 20210304100341.1.I6d587e7ae72a5a47253bb95dfdc3158f8cc8a157@changeid |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: sc7180: Disable the charger thermal zone on more trogdor boards | expand |
Hi, On Thu, Mar 4, 2021 at 10:04 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > Commit f73558cc83d1 ("arm64: dts: qcom: sc7180: Disable charger > thermal zone for lazor") disables the charger thermal zone for > specific lazor revisions due to an unsupported thermistor type. > The initial idea was to disable the thermal zone for older > revisions and leave it enabled for newer ones that use a > supported thermistor. Finally the thermistor won't be changed > on newer revisions, hence the thermal zone should be disabled > for all lazor (and limozeen) revisions. Instead of disabling > it per revision do it once in the shared .dtsi for lazor. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 --------- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 --------- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 --------- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +++++++++ > 4 files changed, 9 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > index 5c997cd90069..30e3e769d2b4 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > @@ -14,15 +14,6 @@ / { > compatible = "google,lazor-rev0", "qcom,sc7180"; > }; > > -/* > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > - * to avoid using bogus temperature values. > - */ > -&charger_thermal { > - status = "disabled"; > -}; > - > &pp3300_hub { > /* pp3300_l7c is used to power the USB hub */ > /delete-property/regulator-always-on; > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > index d9fbcc7bc5bd..c2ef06367baf 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > @@ -14,15 +14,6 @@ / { > compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; > }; > > -/* > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > - * to avoid using bogus temperature values. > - */ > -&charger_thermal { > - status = "disabled"; > -}; > - > &pp3300_hub { > /* pp3300_l7c is used to power the USB hub */ > /delete-property/regulator-always-on; > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > index 19e69adb9e04..1b9d2f46359e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > @@ -13,12 +13,3 @@ / { > model = "Google Lazor (rev3+)"; > compatible = "google,lazor", "qcom,sc7180"; > }; > - > -/* > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > - * to avoid using bogus temperature values. > - */ > -&charger_thermal { > - status = "disabled"; > -}; > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > index 89e5cd29ec09..aa2c4a9098db 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > @@ -58,6 +58,15 @@ ap_ts: touchscreen@10 { > }; > }; > > +/* > + * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > + * not supported by the PM6150 ADC driver. Disable the charger thermal zone > + * to avoid using bogus temperature values. > + */ > +&charger_thermal { > + status = "disabled"; > +}; > + > /* PINCTRL - modifications to sc7180-trogdor.dtsi */ > > &ts_reset_l { The idea is right, but I'm having a hard time figuring out what tree you posted your patch against. You said you did it atop my "v2" series [1], right? ...but the "sc7180-trogdor-lazor.dtsi" really doesn't match. In my tree, for instance, right above the PINCTRL comment should be: &wifi { qcom,ath10k-calibration-variant = "GO_LAZOR"; }; ...but that's definitely not what's there in whatever your patch was written against... It seems like you're also missing the panel and trackpad nodes... [1] https://patchwork.kernel.org/project/linux-arm-msm/list/?series=440315 -Doug
On Fri, Mar 05, 2021 at 10:36:49AM -0800, Doug Anderson wrote: > Hi, > > On Thu, Mar 4, 2021 at 10:04 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > Commit f73558cc83d1 ("arm64: dts: qcom: sc7180: Disable charger > > thermal zone for lazor") disables the charger thermal zone for > > specific lazor revisions due to an unsupported thermistor type. > > The initial idea was to disable the thermal zone for older > > revisions and leave it enabled for newer ones that use a > > supported thermistor. Finally the thermistor won't be changed > > on newer revisions, hence the thermal zone should be disabled > > for all lazor (and limozeen) revisions. Instead of disabling > > it per revision do it once in the shared .dtsi for lazor. > > > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > > --- > > > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 --------- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 --------- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 --------- > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +++++++++ > > 4 files changed, 9 insertions(+), 27 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > > index 5c997cd90069..30e3e769d2b4 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > > @@ -14,15 +14,6 @@ / { > > compatible = "google,lazor-rev0", "qcom,sc7180"; > > }; > > > > -/* > > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > > - * to avoid using bogus temperature values. > > - */ > > -&charger_thermal { > > - status = "disabled"; > > -}; > > - > > &pp3300_hub { > > /* pp3300_l7c is used to power the USB hub */ > > /delete-property/regulator-always-on; > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > > index d9fbcc7bc5bd..c2ef06367baf 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > > @@ -14,15 +14,6 @@ / { > > compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; > > }; > > > > -/* > > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > > - * to avoid using bogus temperature values. > > - */ > > -&charger_thermal { > > - status = "disabled"; > > -}; > > - > > &pp3300_hub { > > /* pp3300_l7c is used to power the USB hub */ > > /delete-property/regulator-always-on; > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > > index 19e69adb9e04..1b9d2f46359e 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts > > @@ -13,12 +13,3 @@ / { > > model = "Google Lazor (rev3+)"; > > compatible = "google,lazor", "qcom,sc7180"; > > }; > > - > > -/* > > - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > > - * not supported by the PM6150 ADC driver. Disable the charger thermal zone > > - * to avoid using bogus temperature values. > > - */ > > -&charger_thermal { > > - status = "disabled"; > > -}; > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > index 89e5cd29ec09..aa2c4a9098db 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > @@ -58,6 +58,15 @@ ap_ts: touchscreen@10 { > > }; > > }; > > > > +/* > > + * Lazor is stuffed with a 47k NTC as charger thermistor which currently is > > + * not supported by the PM6150 ADC driver. Disable the charger thermal zone > > + * to avoid using bogus temperature values. > > + */ > > +&charger_thermal { > > + status = "disabled"; > > +}; > > + > > /* PINCTRL - modifications to sc7180-trogdor.dtsi */ > > > > &ts_reset_l { > > The idea is right, but I'm having a hard time figuring out what tree > you posted your patch against. You said you did it atop my "v2" series > [1], right? ...but the "sc7180-trogdor-lazor.dtsi" really doesn't > match. In my tree, for instance, right above the PINCTRL comment > should be: > > &wifi { > qcom,ath10k-calibration-variant = "GO_LAZOR"; > }; > > ...but that's definitely not what's there in whatever your patch was > written against... It seems like you're also missing the panel and > trackpad nodes... > > [1] https://patchwork.kernel.org/project/linux-arm-msm/list/?series=440315 You got me! I was too lazy to pick all 13 patches, since most of them are irrelevant for this series, but apparently I missed some that are. I guess I'll pick them all for v2 ...
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 5c997cd90069..30e3e769d2b4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -14,15 +14,6 @@ / { compatible = "google,lazor-rev0", "qcom,sc7180"; }; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index d9fbcc7bc5bd..c2ef06367baf 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -14,15 +14,6 @@ / { compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index 19e69adb9e04..1b9d2f46359e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -13,12 +13,3 @@ / { model = "Google Lazor (rev3+)"; compatible = "google,lazor", "qcom,sc7180"; }; - -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 89e5cd29ec09..aa2c4a9098db 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -58,6 +58,15 @@ ap_ts: touchscreen@10 { }; }; +/* + * Lazor is stuffed with a 47k NTC as charger thermistor which currently is + * not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ &ts_reset_l {
Commit f73558cc83d1 ("arm64: dts: qcom: sc7180: Disable charger thermal zone for lazor") disables the charger thermal zone for specific lazor revisions due to an unsupported thermistor type. The initial idea was to disable the thermal zone for older revisions and leave it enabled for newer ones that use a supported thermistor. Finally the thermistor won't be changed on newer revisions, hence the thermal zone should be disabled for all lazor (and limozeen) revisions. Instead of disabling it per revision do it once in the shared .dtsi for lazor. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 --------- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 --------- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 --------- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +++++++++ 4 files changed, 9 insertions(+), 27 deletions(-)