mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210322094628.v4.2.I4138c3edee23d1efa637eef51e841d9d2e266659@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Matthias Kaehlcke 2021-03-22 09:46:34 -07:00 committed by Bjorn Andersson
parent 39441f73d9
commit ad6fc14313
7 changed files with 83 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/qcom/Makefile
View File

@ -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

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

@ -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;

4
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
View File

@ -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";
};

38
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
View File

@ -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";
};

14
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts Normal file
View File

@ -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";
};

15
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts Normal file
View File

@ -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";
};

29
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
View File

@ -107,6 +107,35 @@ ap_ts_pen_1v8: &i2c4 {
};
};
&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
>;
};
&panel {
compatible = "kingdisplay,kd116n21-30nv-a010";
};