arm64: dts: qcom: sc7180: Disable the charger thermal zone on more trogdor boards
Subsystems (4)
v2 cover arm64: dts: qcom: sc7180: Disable the charger thermal zone on more trogdor boards
We already disabled the charger thermal zone for lazor to avoid bogus temperature readings from an unsupported thermistor. Some revisions of other trogdor boards that are added by Doug's 'arm64: dts: qcom: Update sc7180-trogdor variants from downstream' series have the same problem. Disable the charger thermal zone for them too.
This series is based on v2 of the 'arm64: dts: qcom: Update sc7180-trogdor variants from downstream' series
(https://patchwork.kernel.org/project/linux-arm-msm/list/?series=440315)
(no changes since v1)
Matthias Kaehlcke (3):
arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal
zone
arm64: dts: qcom: sc7180: Add pompom rev3
arm64: dts: qcom: sc7180: Add CoachZ rev3
arch/arm64/boot/dts/qcom/Makefile | 4 ++ .../dts/qcom/sc7180-trogdor-coachz-r1.dts | 9 +++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 4 +- .../dts/qcom/sc7180-trogdor-coachz-r2.dts | 13 ++++++- .../dts/qcom/sc7180-trogdor-coachz-r3-lte.dts | 18 +++++++++ .../dts/qcom/sc7180-trogdor-coachz-r3.dts | 15 ++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 ----- .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 ----- .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 ----- .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +++++ .../dts/qcom/sc7180-trogdor-pompom-r1.dts | 12 ++++++ .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +- .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 38 +++++-------------- .../dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 +++++++ .../dts/qcom/sc7180-trogdor-pompom-r3.dts | 15 ++++++++ .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 31 +++++++++++++++ 16 files changed, 151 insertions(+), 62 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
PATCH v2 1/3 arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone
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.
---
Changes in v2:
- none
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(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +0 -9
@@ -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;
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +0 -9
@@ -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;
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +0 -9
@@ -14,12 +14,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"; -};
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +9 -0
@@ -41,6 +41,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"; +}; + &panel { compatible = "boe,nv133fhm-n62"; };
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
Re: [PATCH v2 1/3] arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone
Hi,
Quoted 86 lines · Matthias Kaehlcke
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 <[email protected]>---
Changes in v2:
- nonearch/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(-)arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +0
-9@@ -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;arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +0
-9@@ -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;arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +0
-9@@ -14,12 +14,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"; -};arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +0
-0@@ -41,6 +41,15 @@ ap_ts: touchscreen@10 { };
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi ap_ts: touchscreen@10 { · line 51
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +8
-0}; +/* + * 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"; +};
So this always confuses me too, but the sort order is wrong. :(
While it _looks_like the node above you is "ap_ts", I believe the convention for sorting is not to use labels added in this file. Yeah, we gotta document this somewhere. Thus, this node should be sorted as "charger_thermal" (using a label not defined in this file) and the node above should be sorted as "touchscreen@10" and thus we should go above it.
In general I think the reason we tend to use the node name and not any labels is that it keeps us from having to redo the sort ordering if we give something a new label. It also helps keep the i2c busses together, the SPI busses together, etc.
That's just a sort order nit, though, so:
-Doug
Re: [PATCH v2 1/3] arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone
Quoted 102 lines · Doug Anderson
Hi,
Quoted 86 lines · Matthias Kaehlcke
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 <[email protected]>---
Changes in v2:
- nonearch/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(-)arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +0
-9@@ -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;arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +0
-9@@ -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;arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +0
-9@@ -14,12 +14,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"; -};arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +0
-0@@ -41,6 +41,15 @@ ap_ts: touchscreen@10 { };arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi ap_ts: touchscreen@10 { · line 51
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +8
-0}; +/* + * 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"; +};So this always confuses me too, but the sort order is wrong. :(
Quoted 6 lines
While it
_looks_likethe node above you is "ap_ts", I believe the convention for sorting is not to use labels added in this file. Yeah, we gotta document this somewhere. Thus, this node should be sorted as "charger_thermal" (using a label not defined in this file) and the node above should be sorted as "touchscreen@10" and thus we should go above it.
"ap_ts" is a sub-node of "ap_ts_pen_1v8" (aka "i2c4"), so I think it is irrelevant here. However IIUC the sort order should still change, since "charger_thermal" should be before "i2c4" (ignoring "ap_ts_pen_1v8" defined in this file).
Quoted 4 lines
In general I think the reason we tend to use the node name and not any labels is that it keeps us from having to redo the sort ordering if we give something a new label. It also helps keep the i2c busses together, the SPI busses together, etc.
Yeah, at least for the busses it makes sense. There could also be conflicts for nodes with multiple labels, though one could use the convention of using the first label for sorting.
PATCH v2 2/3 arm64: dts: qcom: sc7180: Add pompom rev3
In reply to Matthias KaehlckeThe only kernel visible change with respect to rev2 is that pompom rev3 changed the charger thermistor from a 47k to a 100k NTC to use a thermistor which is supported by the PM6150 ADC driver.
Disable the charger thermal zone for pompom rev1 and rev2 to avoid the use of bogus temperature values from the unsupported thermistor.
---
Changes in v2:
- moved keyboard definition to sc7180-trogdor-pompom.dtsi instead of duplicating it, use cros-ec keyboard for rev1
- squashed with 'arm64: dts: qcom: sc7180: pompom: Disable charger thermal zone for rev1 and rev2'
arch/arm64/boot/dts/qcom/Makefile | 2 + .../dts/qcom/sc7180-trogdor-pompom-r1.dts | 12 ++++++ .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +- .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 38 +++++-------------- .../dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 +++++++ .../dts/qcom/sc7180-trogdor-pompom-r3.dts | 15 ++++++++ .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 31 +++++++++++++++ 7 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts
arch/arm64/boot/dts/qcom/Makefile +2 -0
@@ -49,6 +49,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts +12 -0
@@ -9,11 +9,23 @@ #include "sc7180-trogdor-pompom.dtsi" +/delete-node/ keyboard_controller; +#include <arm/cros-ec-keyboard.dtsi> + / { model = "Google Pompom (rev1)"; compatible = "google,pompom-rev1", "qcom,sc7180"; }; +/* + * Pompom rev1 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;
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts +2 -2
@@ -9,6 +9,6 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Pompom (rev2+) with LTE"; - compatible = "google,pompom-sku0", "qcom,sc7180"; + model = "Google Pompom (rev2) with LTE"; + compatible = "google,pompom-rev2-sku0", "qcom,sc7180"; };
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts +9 -29
@@ -10,35 +10,15 @@ #include "sc7180-trogdor-pompom.dtsi" / { - model = "Google Pompom (rev2+)"; - compatible = "google,pompom", "qcom,sc7180"; + model = "Google Pompom (rev2)"; + compatible = "google,pompom-rev2", "qcom,sc7180"; }; -&keyboard_controller { - function-row-physmap = < - MATRIX_KEY(0x00, 0x02, 0) /* T1 */ - MATRIX_KEY(0x03, 0x02, 0) /* T2 */ - MATRIX_KEY(0x02, 0x02, 0) /* T3 */ - MATRIX_KEY(0x01, 0x02, 0) /* T4 */ - MATRIX_KEY(0x03, 0x04, 0) /* T5 */ - MATRIX_KEY(0x02, 0x04, 0) /* T6 */ - MATRIX_KEY(0x01, 0x04, 0) /* T7 */ - MATRIX_KEY(0x02, 0x09, 0) /* T8 */ - MATRIX_KEY(0x01, 0x09, 0) /* T9 */ - MATRIX_KEY(0x00, 0x04, 0) /* T10 */ - >; - linux,keymap = < - MATRIX_KEY(0x00, 0x02, KEY_BACK) - MATRIX_KEY(0x03, 0x02, KEY_REFRESH) - MATRIX_KEY(0x02, 0x02, KEY_ZOOM) - MATRIX_KEY(0x01, 0x02, KEY_SCALE) - MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) - MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) - MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) - MATRIX_KEY(0x02, 0x09, KEY_MUTE) - MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) - MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) - - CROS_STD_MAIN_KEYMAP - >; +/* + * Pompom rev2 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"; };
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2021 Google LLC. + */ + +#include "sc7180-trogdor-pompom-r3.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Pompom (rev3+) with LTE"; + compatible = "google,pompom-sku0", "qcom,sc7180"; +};
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-pompom.dtsi" + +/ { + model = "Google Pompom (rev3+)"; + compatible = "google,pompom", "qcom,sc7180"; +};
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +31 -0
@@ -107,6 +107,37 @@ ap_ts: touchscreen@10 { }; }; +&keyboard_controller { + function-row-physmap = < + MATRIX_KEY(0x00, 0x02, 0) /* T1 */ + MATRIX_KEY(0x03, 0x02, 0) /* T2 */ + MATRIX_KEY(0x02, 0x02, 0) /* T3 */ + MATRIX_KEY(0x01, 0x02, 0) /* T4 */ + MATRIX_KEY(0x03, 0x04, 0) /* T5 */ + MATRIX_KEY(0x02, 0x04, 0) /* T6 */ + MATRIX_KEY(0x01, 0x04, 0) /* T7 */ + MATRIX_KEY(0x02, 0x09, 0) /* T8 */ + MATRIX_KEY(0x01, 0x09, 0) /* T9 */ + MATRIX_KEY(0x00, 0x04, 0) /* T10 */ + >; + linux,keymap = < + MATRIX_KEY(0x00, 0x02, KEY_BACK) + MATRIX_KEY(0x03, 0x02, KEY_REFRESH) + MATRIX_KEY(0x02, 0x02, KEY_ZOOM) + MATRIX_KEY(0x01, 0x02, KEY_SCALE) + MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) + MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) + MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) + MATRIX_KEY(0x02, 0x09, KEY_MUTE) + MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) + MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) + + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* LOCK key */ + + CROS_STD_MAIN_KEYMAP + >; +}; + &panel { compatible = "kingdisplay,kd116n21-30nv-a010"; };
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
Re: [PATCH v2 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
Hi,
Quoted 4 lines · Matthias Kaehlcke
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +3
-0+ linux,keymap = < + MATRIX_KEY(0x00, 0x02, KEY_BACK) + MATRIX_KEY(0x03, 0x02, KEY_REFRESH)
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi ap_ts: touchscreen@10 { · line 135
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +10
-0+ MATRIX_KEY(0x02, 0x02, KEY_ZOOM) + MATRIX_KEY(0x01, 0x02, KEY_SCALE) + MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) + MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) + MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) + MATRIX_KEY(0x02, 0x09, KEY_MUTE) + MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) + MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) + + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* LOCK key */
I don't think you want the LOCK key. See <https://crrev.com/c/2719075>
-Doug
Re: [PATCH v2 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
Quoted 18 lines · Doug Anderson
Hi,
Quoted 4 lines · Matthias Kaehlcke
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +3
-0+ linux,keymap = < + MATRIX_KEY(0x00, 0x02, KEY_BACK) + MATRIX_KEY(0x03, 0x02, KEY_REFRESH)arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi ap_ts: touchscreen@10 { · line 135
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +10
-0+ MATRIX_KEY(0x02, 0x02, KEY_ZOOM) + MATRIX_KEY(0x01, 0x02, KEY_SCALE) + MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) + MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) + MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) + MATRIX_KEY(0x02, 0x09, KEY_MUTE) + MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) + MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) + + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* LOCK key */
Quoted 1 line
I don't think you want the LOCK key. See <https://crrev.com/c/2719075>
ack, thanks!
PATCH v2 3/3 arm64: dts: qcom: sc7180: Add CoachZ rev3
In reply to Matthias KaehlckeCoachZ rev3 uses a 100k NTC thermistor for the charger temperatures, instead of the 47k NTC that is stuffed in earlier revisions. Add .dts files for rev3.
The 47k NTC currently isn't supported by the PM6150 ADC driver. Disable the charger thermal zone for rev1 and rev2 to avoid the use of bogus temperature values.
---
Changes in v2:
- added CoachZ rev3
- updated subject and commit message
arch/arm64/boot/dts/qcom/Makefile | 2 ++ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 9 +++++++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 4 ++-- .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 13 +++++++++++-- .../dts/qcom/sc7180-trogdor-coachz-r3-lte.dts | 18 ++++++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-coachz-r3.dts | 15 +++++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts
arch/arm64/boot/dts/qcom/Makefile +2 -0
@@ -35,6 +35,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r2-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +9 -0
@@ -14,6 +14,15 @@ / { compatible = "google,coachz-rev1", "qcom,sc7180"; }; +/* + * CoachZ rev1 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"; +}; + &tlmm { gpio-line-names = "HUB_RST_L", "AP_RAM_ID0",
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2-lte.dts +2 -2
@@ -9,8 +9,8 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google CoachZ (rev2+) with LTE"; - compatible = "google,coachz-sku0", "qcom,sc7180"; + model = "Google CoachZ (rev2) with LTE"; + compatible = "google,coachz-rev2-sku0", "qcom,sc7180"; }; &cros_ec_proximity {
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts +11 -2
@@ -10,6 +10,15 @@ #include "sc7180-trogdor-coachz.dtsi" / { - model = "Google CoachZ (rev2+)"; - compatible = "google,coachz", "qcom,sc7180"; + model = "Google CoachZ (rev2)"; + compatible = "google,coachz-rev2", "qcom,sc7180"; +}; + +/* + * CoachZ rev2 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"; };
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3-lte.dts new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2021 Google LLC. + */ + +#include "sc7180-trogdor-coachz-r3.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google CoachZ (rev3+) with LTE"; + compatible = "google,coachz-sku0", "qcom,sc7180"; +}; + +&cros_ec_proximity { + label = "proximity-wifi-lte"; +};
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google CoachZ board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-coachz.dtsi" + +/ { + model = "Google CoachZ (rev3+)"; + compatible = "google,coachz", "qcom,sc7180"; +};
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
Re: [PATCH v2 3/3] arm64: dts: qcom: sc7180: Add CoachZ rev3
Hi,
Quoted 16 lines · Matthias Kaehlcke
CoachZ rev3 uses a 100k NTC thermistor for the charger temperatures, instead of the 47k NTC that is stuffed in earlier revisions. Add .dts files for rev3.
The 47k NTC currently isn't supported by the PM6150 ADC driver. Disable the charger thermal zone for rev1 and rev2 to avoid the use of bogus temperature values.
Signed-off-by Matthias Kaehlcke <[email protected]>---
Changes in v2:
- added CoachZ rev3
- updated subject and commit message
Quoted 7 lines
arch/arm64/boot/dts/qcom/Makefile | 2 ++ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 9 +++++++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 4 ++-- .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 13 +++++++++++-- .../dts/qcom/sc7180-trogdor-coachz-r3-lte.dts | 18 ++++++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-coachz-r3.dts | 15 +++++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-)
So what you have here is good and we could land it. Feel free to add my Reviewed-by tag if you want.
...but I want to propose an alternative. It turns out that these days coachz-r1 and coachz-r2 are actually the same. The only reason both exist is because <https://crrev.com/c/2733863> ("CHROMIUM: arm64: dts:
qcom: sc7180: add dmic_clk_en back") wasn't the proper inverse of
<https://crrev.com/c/2596726> ("CHROMIUM: arm64: dts: qcom: sc7180:
remove dmic_clk_en").
It sorta squashes two changes into one, but if you combined your change with one that folded "-r1" into "-r2" it would actually make a smaller / easier to understand change, essentially, it would be:
- just a rename of the "-r2" file to be "-r3"
- add "-rev2" into the list of compatibles in "-r1" file.
- add the "disable" into the "-r1" file.
Anyway, I'll leave it up to you.
-Doug
Re: [PATCH v2 3/3] arm64: dts: qcom: sc7180: Add CoachZ rev3
Quoted 37 lines · Doug Anderson
Hi,
Quoted 16 lines · Matthias Kaehlcke
CoachZ rev3 uses a 100k NTC thermistor for the charger temperatures, instead of the 47k NTC that is stuffed in earlier revisions. Add .dts files for rev3.
The 47k NTC currently isn't supported by the PM6150 ADC driver. Disable the charger thermal zone for rev1 and rev2 to avoid the use of bogus temperature values.
Signed-off-by Matthias Kaehlcke <[email protected]>---
Changes in v2:
- added CoachZ rev3
- updated subject and commit messageQuoted 7 lines
arch/arm64/boot/dts/qcom/Makefile | 2 ++ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 9 +++++++++ .../dts/qcom/sc7180-trogdor-coachz-r2-lte.dts | 4 ++-- .../boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 13 +++++++++++-- .../dts/qcom/sc7180-trogdor-coachz-r3-lte.dts | 18 ++++++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-coachz-r3.dts | 15 +++++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-)So what you have here is good and we could land it. Feel free to add my Reviewed-by tag if you want.
...but I want to propose an alternative. It turns out that these days coachz-r1 and coachz-r2 are actually the same. The only reason both exist is because <https://crrev.com/c/2733863> ("CHROMIUM: arm64: dts:
qcom: sc7180: adddmic_clk_enback") wasn't the proper inverse of
<https://crrev.com/c/2596726> ("CHROMIUM: arm64: dts: qcom: sc7180:
removedmic_clk_en").
Quoted 6 lines
It sorta squashes two changes into one, but if you combined your change with one that folded "-r1" into "-r2" it would actually make a smaller / easier to understand change, essentially, it would be:
- just a rename of the "-r2" file to be "-r3"
- add "-rev2" into the list of compatibles in "-r1" file.
- add the "disable" into the "-r1" file.
I agree, if rev1 and rev2 are the same in terms of the DT they should use the same file(s).