Commit ad6fc143 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Bjorn Andersson
Browse files

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: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210322094628.v4.2.I4138c3edee23d1efa637eef51e841d9d2e266659@changeid


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 39441f73

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,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)	+= sc7280-idp.dtb

arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts

+12 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

0 → 100644
+14 −0
Original line number Diff line number Diff line 
// 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";

};