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 <mka@xxxxxxxxxxxx> 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 <mka@xxxxxxxxxxxx> > > --- > > > > 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 :/
