Re: [PATCH v3 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
On Fri, Mar 19, 2021 at 08:12:40AM -0700, Doug Anderson wrote: > Hi, > > On Mon, Mar 15, 2021 at 6:15 PM Matthias Kaehlcke wrote: > > > > The 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. > > > > Signed-off-by: Matthias Kaehlcke > > --- > > > > Changes in v3: > > - don't add LOCK key > > > > 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 | 29 ++ > > 7 files changed, 83 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 > > > > diff --git a/arch/arm64/boot/dts/qcom/Makefile > > b/arch/arm64/boot/dts/qcom/Makefile > > index a81966d59cf7..11aa83ca798f 100644 > > --- a/arch/arm64/boot/dts/qcom/Makefile > > +++ b/arch/arm64/boot/dts/qcom/Makefile > > @@ -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 > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > > b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > > index e720e7bd0d70..7f87877408c5 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > > @@ -9,11 +9,23 @@ > > > > #include "sc7180-trogdor-pompom.dtsi" > > > > +/delete-node/ keyboard_controller; > > So I just tried to compile your patch and I found that it doesn't > compile. :( The above needs to be: > > /delete-node/ &keyboard_controller; I swear I did a test build, it seems I did that build in another kernel tree :/
Re: [PATCH v3 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
Hi, On Mon, Mar 15, 2021 at 6:15 PM Matthias Kaehlcke wrote: > > The 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. > > Signed-off-by: Matthias Kaehlcke > --- > > Changes in v3: > - don't add LOCK key > > 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 | 29 ++ > 7 files changed, 83 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 > > diff --git a/arch/arm64/boot/dts/qcom/Makefile > b/arch/arm64/boot/dts/qcom/Makefile > index a81966d59cf7..11aa83ca798f 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -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 > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > index e720e7bd0d70..7f87877408c5 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts > @@ -9,11 +9,23 @@ > > #include "sc7180-trogdor-pompom.dtsi" > > +/delete-node/ keyboard_controller; So I just tried to compile your patch and I found that it doesn't compile. :( The above needs to be: /delete-node/ &keyboard_controller; -Doug
Re: [PATCH v3 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
Hi, On Mon, Mar 15, 2021 at 6:15 PM Matthias Kaehlcke wrote: > > The 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. > > Signed-off-by: Matthias Kaehlcke > --- > > Changes in v3: > - don't add LOCK key > > 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 | 29 ++ > 7 files changed, 83 insertions(+), 31 deletions(-) Reviewed-by: Douglas Anderson
[PATCH v3 2/3] arm64: dts: qcom: sc7180: Add pompom rev3
The 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.
Signed-off-by: Matthias Kaehlcke
---
Changes in v3:
- don't add LOCK key
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 | 29 ++
7 files changed, 83 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
diff --git a/arch/arm64/boot/dts/qcom/Makefile
b/arch/arm64/boot/dts/qcom/Makefile
index a81966d59cf7..11aa83ca798f 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -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
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
index e720e7bd0d70..7f87877408c5 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
@@ -9,11 +9,23 @@
#include "sc7180-trogdor-pompom.dtsi"
+/delete-node/ keyboard_controller;
+#include
+
/ {
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;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
index 791d496ad046..00e187c08eb9 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
index 984d7337da78..4f32e6733f4c 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
@@ -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, 0
