arm64/dts: comet: Change SYS_UVLO2_REL/BATOILO2_REL to 1ms am: d1ce7d82b6 am: 2431b84f24
Original change: https://partner-android-review.googlesource.com/c/kernel/private/devices/google/comet/+/2848625
Change-Id: Iff08508300fd5f9f217e6375157a59fd5ef58ae6
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/BUILD.bazel b/BUILD.bazel
index 97924c6..d96cafc 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,38 +2,35 @@
load("@bazel_skylib//lib:paths.bzl", "paths")
load("@bazel_skylib//rules:write_file.bzl", "write_file")
-load("//aosp:modules.bzl", "get_gki_modules_list")
load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
load("//build/kernel/kleaf:hermetic_tools.bzl", "hermetic_genrule")
load(
"//build/kernel/kleaf:kernel.bzl",
"kernel_abi",
"kernel_build",
+ "kernel_build_config",
"kernel_images",
+ "kernel_module",
"kernel_module_group",
"kernel_modules_install",
"kernel_unstripped_modules_archive",
"merged_kernel_uapi_headers",
)
-load(
- "//private/devices/google/common:device_build_configs.bzl",
- "device_build_configs",
- "extracted_system_dlkm",
- "lto_dependant_kernel_module",
-)
+load("//common:modules.bzl", "get_gki_modules_list")
+load("//private/devices/google/common/kleaf:device.bzl", "extracted_system_dlkm")
-device_build_configs(
- name = "build.config.comet",
- base_build_config = ":build.config.comet",
- device_name = "comet",
+kernel_build_config(
+ name = "comet_build_config",
+ srcs = [
+ # do not sort
+ "//common:set_kernel_dir_build_config",
+ "build.config.comet",
+ ],
)
filegroup(
name = "gki_aarch64_boot_lz4",
- srcs = select({
- "//private/devices/google/common:gki_aosp": ["//aosp:kernel_aarch64_gki_artifacts_download_or_build"],
- "//private/devices/google/common:gki_aosp_staging": ["//aosp-staging:kernel_aarch64_gki_artifacts_download_or_build"],
- }),
+ srcs = ["//common:kernel_aarch64_gki_artifacts_download_or_build"],
)
hermetic_genrule(
@@ -146,7 +143,7 @@
"comet*.fragment",
]) + [
# keep sorted
- "//private/devices/google/common:debug_build_configs",
+ "//common:kernel_aarch64_sources",
"//private/devices/google/zumapro:build.config.zumapro",
"//private/google-modules/bms/misc:bms-misc.kconfig",
"//private/google-modules/display/common:common.kconfig",
@@ -162,10 +159,7 @@
"//private/google-modules/touch/sec:sec.kconfig",
"//private/google-modules/trusty:trusty.kconfig",
"//private/google-modules/wlan/wlan_ptracker:wlan_ptracker.kconfig",
- ] + select({
- "//private/devices/google/common:gki_aosp": ["//aosp:kernel_aarch64_sources"],
- "//private/devices/google/common:gki_aosp_staging": ["//aosp-staging:kernel_aarch64_sources"],
- }),
+ ],
outs = [
"google/google-dts-zuma/zuma-{}.dtb".format(soc_rev)
for soc_rev in ZUMA_SOC_REVS
@@ -174,18 +168,13 @@
for soc_rev in ZUMAPRO_SOC_REVS
] + _ZUMA_COMET_DTBOS + _ZUMAPRO_COMET_DTBOS,
# TODO(b/221278445): Use real GKI
- base_kernel = select({
- "//private/devices/google/common:gki_aosp": "//aosp:kernel_aarch64_download_or_build",
- "//private/devices/google/common:gki_aosp_staging": "//aosp-staging:kernel_aarch64_download_or_build",
- }),
- build_config = ":device_build_config",
+ base_kernel = "//common:kernel_aarch64_download_or_build",
+ build_config = ":comet_build_config",
collect_unstripped_modules = True,
+ defconfig_fragments = ["//private/devices/google/zumapro:zumapro_defconfig"],
dtstree = "//private/devices/google/comet/dts:comet.dt",
- kconfig_ext = "//private/google-modules/soc/gs:Kconfig.ext",
- kmi_symbol_list = select({
- "//private/devices/google/common:gki_aosp": "//aosp:android/abi_gki_aarch64_pixel",
- "//private/devices/google/common:gki_aosp_staging": "//aosp-staging:android/abi_gki_aarch64_pixel",
- }),
+ kconfig_ext = "Kconfig.ext",
+ kmi_symbol_list = "//common:android/abi_gki_aarch64_pixel",
make_goals = _PIXEL_MAKE_GOALS,
module_outs = [
# keep sorted
@@ -212,7 +201,7 @@
module_grouping = False,
)
-lto_dependant_kernel_module(
+kernel_module(
name = "zumapro_soc.comet",
srcs = [
"//private/google-modules/soc/gs:gs_soc_sources",
@@ -318,6 +307,7 @@
"drivers/soc/google/gsa/gsa_gsc.ko",
"drivers/soc/google/hardlockup-debug.ko",
"drivers/soc/google/hardlockup-watchdog.ko",
+ "drivers/soc/google/kernel-top.ko",
"drivers/soc/google/pa_kill/pa_kill.ko",
"drivers/soc/google/perf_trace_counters.ko",
"drivers/soc/google/pixel_stat/mm/pixel_stat_mm.ko",
@@ -344,11 +334,11 @@
"drivers/thermal/samsung/gs_thermal.ko",
"drivers/tty/serial/exynos_tty.ko",
"drivers/ufs/ufs-exynos-gs.ko",
+ "drivers/ufs/ufs-pixel-fips140.ko",
"drivers/usb/dwc3/dwc3-exynos-usb.ko",
"drivers/usb/gadget/function/usb_f_dm.ko",
"drivers/usb/gadget/function/usb_f_dm1.ko",
"drivers/usb/gadget/function/usb_f_etr_miu.ko",
- "drivers/usb/gadget/function/usb_f_rndis.ko",
"drivers/usb/host/xhci-exynos.ko",
"drivers/usb/typec/tcpm/google/bc_max77759.ko",
"drivers/usb/typec/tcpm/google/google_tcpci_shim.ko",
@@ -362,9 +352,6 @@
"drivers/watchdog/s3c2410_wdt.ko",
],
kernel_build = "//private/google-modules/soc/gs:gs_kernel_build",
- lto_outs = [
- "drivers/ufs/ufs-pixel-fips140.ko",
- ],
makefile = ["//private/google-modules/soc/gs:Makefile"],
visibility = [
# keep sorted
@@ -422,10 +409,7 @@
kernel_images(
name = "zumapro_comet_images",
- base_kernel_images = select({
- "//private/devices/google/common:gki_aosp": "//aosp:kernel_aarch64_images_download_or_build",
- "//private/devices/google/common:gki_aosp_staging": "//aosp-staging:kernel_aarch64_images_download_or_build",
- }),
+ base_kernel_images = "//common:kernel_aarch64_images_download_or_build",
boot_image_outs = ["dtb.img"],
build_boot = False,
build_dtbo = True,
@@ -450,8 +434,7 @@
deps = [
# Keep the following in sync with (vendor|system)_dlkm.props.zumapro:
# selinux_fc
- "//prebuilts/boot-artifacts/selinux:file_contexts",
- "//prebuilts/boot-artifacts/selinux:system_file_contexts",
+ "//private/devices/google/common:sepolicy",
],
)
@@ -497,18 +480,10 @@
":zumapro_comet_unstripped_modules_archive",
":insmod_cfgs",
":zuma_comet_extracted_system_dlkm",
+ "//common:android/abi_gki_aarch64_pixel",
+ "//common:kernel_aarch64_download_or_build",
+ "//common:kernel_aarch64_headers_download_or_build",
] + select({
- "//private/devices/google/common:gki_aosp": [
- "//aosp:android/abi_gki_aarch64_pixel",
- "//aosp:kernel_aarch64_download_or_build",
- "//aosp:kernel_aarch64_headers_download_or_build",
- ],
- "//private/devices/google/common:gki_aosp_staging": [
- "//aosp-staging:android/abi_gki_aarch64_pixel",
- "//aosp-staging:kernel_aarch64_download_or_build",
- "//aosp-staging:kernel_aarch64_headers_download_or_build",
- ],
-}) + select({
"//private/devices/google/common:enable_download_fips140": ["@gki_prebuilt_fips140//fips140.ko"],
"//private/devices/google/common:disable_download_fips140": [],
})
@@ -516,10 +491,7 @@
extracted_system_dlkm(
name = "zuma_comet_extracted_system_dlkm",
gki_modules = [paths.basename(m) for m in _GKI_MODULES],
- images = select({
- "//private/devices/google/common:gki_aosp": "//aosp:kernel_aarch64_images_download_or_build",
- "//private/devices/google/common:gki_aosp_staging": "//aosp-staging:kernel_aarch64_images_download_or_build",
- }),
+ images = "//common:kernel_aarch64_images_download_or_build",
)
copy_to_dist_dir(
diff --git a/Kconfig.ext b/Kconfig.ext
new file mode 100644
index 0000000..a37b5f0
--- /dev/null
+++ b/Kconfig.ext
@@ -0,0 +1,97 @@
+# SPDX-License-Identifier: GPL-2.0
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/pci/controller/dwc/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/misc/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/clk/gs/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/soc/google/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/input/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/char/hw_random/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/tty/serial/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/ufs/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/i2c/busses/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/usb/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/rtc/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/dma/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/dma-buf/heaps/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/spi/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/spmi/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/pinctrl/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/power/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/thermal/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/watchdog/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/regulator/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/mfd/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/media/platform/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/video/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/clocksource/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/iommu/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/cpufreq/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/devfreq/google/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/performance/gs_perf_mon/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/performance/lat_governors/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/iio/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/phy/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/staging/android/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/bts/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/block/zram/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/pwm/Kconfig"
+
+source "$(KCONFIG_SOC_GS_PREFIX)drivers/video/backlight/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/bms/misc/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/display/common/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/display/samsung/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/display/samsung/panel/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/fingerprint/qcom/qfs4008/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/touch/common/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/touch/fts/ftm5/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/touch/sec/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/trusty/drivers/trusty/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/power/reset/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/radio/samsung/s5400/Kconfig"
+
+source "$(KCONFIG_EXT_MODULES_PREFIX)private/google-modules/wlan/wlan_ptracker/Kconfig"
diff --git a/build.config.comet b/build.config.comet
index ce3185c..3a84315 100644
--- a/build.config.comet
+++ b/build.config.comet
@@ -1,20 +1,17 @@
-# KERNEL_DIR is set by the environment to the directory where the BUILD_CONFIG
-# file is located.
-DEVICE_DIR=${KERNEL_DIR}
+KCONFIG_EXT_MODULES_PREFIX=../
+KCONFIG_SOC_GS_PREFIX=${KCONFIG_EXT_MODULES_PREFIX}/private/google-modules/soc/gs/
+DEVICE_DIR=private/devices/google/comet
SOC_DIR=private/google-modules/soc/gs
-# Compile these modules with the GKI kernel
-KERNEL_DIR=${GKI_KERNEL_DIR:-"aosp-staging"}
# These just need to be relative to the ROOT_DIR
FRAGMENT_CONFIG=${DEVICE_DIR}/comet_gki.fragment
. ${ROOT_DIR}/private/devices/google/zumapro/build.config.zumapro
-MAKE_GOALS="$MAKE_GOALS
-modules
-dtbs
-"
+DTC_INCLUDE="${ROOT_DIR}/${SOC_DIR}/include/dtc \
+ ${ROOT_DIR}/${KERNEL_DIR}/include \
+ include \
+ ${ROOT_DIR}/${DEVICE_DIR}/dts/google/google-dts-ripcurrent"
-DTC_INCLUDE=${ROOT_DIR}/${SOC_DIR}/include/dtc
MKDTIMG_FLAGS="--page_size=4096 --id=/:board_id --rev=/:board_rev"
BCMDHD=4390
diff --git a/build.config.comet.gki.fragment b/build.config.comet.gki.fragment
deleted file mode 100644
index 09f980d..0000000
--- a/build.config.comet.gki.fragment
+++ /dev/null
@@ -1,13 +0,0 @@
-TRIM_NONLISTED_KMI=0
-KMI_SYMBOL_LIST_STRICT_MODE=0
-
-# replace check_defconfig with a no-op
-POST_DEFCONFIG_CMDS="${POST_DEFCONFIG_CMDS//check_defconfig/true}"
-append_cmd POST_DEFCONFIG_CMDS update_comet_gki_config
-
-function update_comet_gki_config() {
- ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
- -d ARM64_SVE
- (cd ${OUT_DIR} && \
- make O=${OUT_DIR} "${TOOL_ARGS[@]}" ${MAKE_ARGS} olddefconfig)
-}
diff --git a/build_comet.sh b/build_comet.sh
index 763145d..9d308ee 100755
--- a/build_comet.sh
+++ b/build_comet.sh
@@ -1,51 +1,21 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
-function exit_if_error {
- if [ $1 -ne 0 ]; then
- echo "ERROR: $2: retval=$1" >&2
- exit $1
- fi
-}
-
-if [ "${BUILD_AOSP_KERNEL}" = "1" -a "${BUILD_STAGING_KERNEL}" = "1" ]; then
- echo "BUILD_AOSP_KERNEL=1 is incompatible with BUILD_STAGING_KERNEL."
- exit_if_error 1 "Flags incompatible with BUILD_AOSP_KERNEL detected"
+parameters=
+if [ "${BUILD_AOSP_KERNEL}" = "1" ]; then
+ echo "WARNING: BUILD_AOSP_KERNEL is deprecated." \
+ "Use --kernel_package=@//aosp instead." >&2
+ parameters="--kernel_package=@//aosp"
fi
-parameters=
-bazelrc_file="private/devices/google/common/device.bazelrc"
-GKI_BUILD_ID=`sed -n 's/.*gki_prebuilts=\([0-9]\+\).*/\1/p' $bazelrc_file`
-USE_GKI=`grep "^build --config=download_gki" $bazelrc_file`
-NO_USE_GKI=`grep "^build --config=no_download_gki" $bazelrc_file`
-USE_AOSP=`grep "^build --config=use_source_tree_aosp$" $bazelrc_file`
-USE_AOSP_STAGING=`grep "^build --config=use_source_tree_aosp_staging$" $bazelrc_file`
-if [ "${BUILD_AOSP_KERNEL}" = "1" ] || [ -n "${USE_AOSP}" ]; then
- if [ "${#}" = "0" ]; then
- echo -e "\nBuilding with core-kernel generated from source tree aosp/\n"
- fi
- parameters="--config=use_source_tree_aosp --config=no_download_gki"
-elif [ "${BUILD_STAGING_KERNEL}" = "1" ] || [ -n "${USE_AOSP_STAGING}" ]; then
- if [ "${#}" = "0" ]; then
- echo -e "\nBuilding with core-kernel generated from source tree aosp-staging/\n"
- fi
- parameters="--config=use_source_tree_aosp_staging --config=no_download_gki"
-elif [ -n "${GKI_BUILD_ID}" ] && [ -n "${USE_GKI}" ] && [ -z "${NO_USE_GKI}" ] && [ -z "${USE_AOSP}" ] && [ -z "${USE_AOSP_STAGING}" ]; then
- if [ "${#}" = "0" ]; then
- echo -e "\nBuilding with GKI prebuilts from ab/$GKI_BUILD_ID - kernel_aarch64\n"
- fi
-else
- if [ "${#}" = "0" ]; then
- echo -e "\nPlease check private/devices/google/common/device.bazelrc"
- echo -e " 1) IF \"build --config=use_source_tree_aosp\" ----> core-kernel generated from source tree aosp/"
- echo -e " 2) IF \"build --config=use_source_tree_aosp_staging\" ----> core-kernel generated from source tree aosp-staging/"
- echo -e " 3) IF \"build --config=download_gki\" ----> core-kernel based on GKI prebuilts\n"
- fi
+if [ "${BUILD_STAGING_KERNEL}" = "1" ]; then
+ echo "WARNING: BUILD_STAGING_KERNEL is deprecated." \
+ "Use --kernel_package=@//aosp-staging instead." >&2
+ parameters="--kernel_package=@//aosp-staging"
fi
exec tools/bazel run \
${parameters} \
--config=stamp \
--config=comet \
- --config=fast \
//private/devices/google/comet:zumapro_comet_dist "$@"
diff --git a/comet_gki.fragment b/comet_gki.fragment
index 8c18762..1595cb9 100644
--- a/comet_gki.fragment
+++ b/comet_gki.fragment
@@ -1,5 +1,4 @@
# CONFIG_MODULE_SIG_ALL is not set
-# CONFIG_VH_I2C is not set
# CONFIG_ZRAM is not set
CONFIG_VH_FS=m
CONFIG_VH_MM=m
@@ -8,7 +7,8 @@
# CONFIG_MEMLAT_DEVFREQ is not set
CONFIG_TICK_DRIVEN_LATGOV=y
CONFIG_GS_PERF_MON=m
-CONFIG_GS_LATENCY_GOVERNOR=m
+CONFIG_GS_MEMLAT_GOVERNOR=m
+CONFIG_GS_DSULAT_GOVERNOR=m
CONFIG_PERF_TRACE_CTRS=m
CONFIG_ARM_EXYNOS_DEVFREQ=m
CONFIG_SOC_GOOGLE=y
@@ -67,6 +67,7 @@
CONFIG_EXYNOS_GS_COMMON_CLK=m
CONFIG_INPUT_KEYCOMBO=m
CONFIG_INPUT_KEYDEBUG=m
+CONFIG_KERNEL_TOP=m
CONFIG_INPUT_STMVL53L1=m
CONFIG_EXYNOS_GRAPHICS_G2D=m
CONFIG_VIDEO_EXYNOS_SMFC=m
@@ -80,7 +81,6 @@
CONFIG_USB_DWC3_EXYNOS_GS=m
CONFIG_USB_CONFIGFS_F_DM=m
CONFIG_USB_CONFIGFS_F_ETR_MIU=m
-CONFIG_USB_CONFIGFS_RNDIS_GS=m
CONFIG_USB_XHCI_EXYNOS=m
CONFIG_PHY_EXYNOS_USBDRD_EUSB=m
CONFIG_PHY_EXYNOS_EUSB_REPEATER=m
diff --git a/display/panel-gs-ct3b.c b/display/panel-gs-ct3b.c
index 5064add..ce2f2b3 100644
--- a/display/panel-gs-ct3b.c
+++ b/display/panel-gs-ct3b.c
@@ -1922,6 +1922,8 @@
ctx->hw_status.vrefresh = 60;
ctx->hw_status.te.rate_hz = 60;
+ /* always use fixed TE */
+ ctx->hw_status.te.option = TEX_OPT_FIXED;
spanel->dbv_range = DBV_INIT;
clear_bit(FEAT_ZA, ctx->hw_status.feat);
diff --git a/dts/BUILD.bazel b/dts/BUILD.bazel
index 03574ff..b36fe67 100644
--- a/dts/BUILD.bazel
+++ b/dts/BUILD.bazel
@@ -13,8 +13,6 @@
"google/google-dts-zumapro/*.dtsi",
"google/google-dts-ripcurrent/*.dts",
"google/google-dts-ripcurrent/*.dtsi",
- "google/google-dts-zuma/google-dts-ripcurrent/*.dts",
- "google/google-dts-zuma/google-dts-ripcurrent/*.dtsi",
"google/google-dts-zumapro/google-dts-zuma/*.dts",
"google/google-dts-zumapro/google-dts-zuma/*.dtsi",
"google/google-dts-ripcurrent/google-dts-zuma/*.dts",
@@ -23,7 +21,6 @@
"Makefile",
"google/Makefile",
"google/google-dts-ripcurrent/Makefile",
- "google/google-dts-ripcurrent/google-dts-zuma/google-dts-ripcurrent/zuma-ripcurrent-battery-data.dtsi",
"google/google-dts-zuma/Makefile",
"google/google-dts-zumapro/Makefile",
"//private/google-modules/soc/gs:gs.dt-bindings",
diff --git a/dts/google/zuma-comet-haptics-dev1.dtsi b/dts/google/zuma-comet-haptics-dev1.dtsi
index 21fa5a2..085dd58 100644
--- a/dts/google/zuma-comet-haptics-dev1.dtsi
+++ b/dts/google/zuma-comet-haptics-dev1.dtsi
@@ -83,7 +83,6 @@
cs40l26a@43 {
compatible = "cirrus,cs40l26a";
reg = <0x43>;
- dev-name = "cs40l26a"; /* sysfs folder name */
input-device-name = "cs40l26_input"; /* input device name */
pinctrl-names = "default";
diff --git a/dts/google/zuma-comet-haptics.dtsi b/dts/google/zuma-comet-haptics.dtsi
index 16c0cdd..601f83c 100644
--- a/dts/google/zuma-comet-haptics.dtsi
+++ b/dts/google/zuma-comet-haptics.dtsi
@@ -77,7 +77,6 @@
cs40l26a@43 {
compatible = "cirrus,cs40l26a";
reg = <0x43>;
- dev-name = "cs40l26a"; /* sysfs folder name */
input-device-name = "cs40l26_input"; /* input device name */
pinctrl-names = "default";
diff --git a/dts/google/zuma-comet-nfc.dtsi b/dts/google/zuma-comet-nfc.dtsi
index 30b6e36..1b48468 100644
--- a/dts/google/zuma-comet-nfc.dtsi
+++ b/dts/google/zuma-comet-nfc.dtsi
@@ -37,7 +37,6 @@
st21nfc@8 {
compatible = "st,st21nfc";
reg = <0x08>;
- dev-name = "st21nfc";
pinctrl-names = "default";
pinctrl-0 = <&nfc_rst &nfc_pidle>;
diff --git a/dts/google/zuma-comet-wcharger-evt.dtsi b/dts/google/zuma-comet-wcharger-evt.dtsi
index c633688..7654c26 100644
--- a/dts/google/zuma-comet-wcharger-evt.dtsi
+++ b/dts/google/zuma-comet-wcharger-evt.dtsi
@@ -62,4 +62,7 @@
idt,irq_gpio = <&max77779_sgpio 4 GPIO_ACTIVE_LOW>; /* QI_INT_ODL */
idt,gpio_slct = <&s2mpg15_gpio 5 GPIO_ACTIVE_HIGH>; /* QI_BPP_EPP_SLCT */
idt,gpio_slct_value = <1>;
+
+ /* High dissipation adapter */
+ google,hda-tz-wlc;
};
diff --git a/dts/google/zuma-wcharger-p9222.dtsi b/dts/google/zuma-wcharger-p9222.dtsi
index 97fc719..0b1da67 100644
--- a/dts/google/zuma-wcharger-p9222.dtsi
+++ b/dts/google/zuma-wcharger-p9222.dtsi
@@ -10,7 +10,6 @@
compatible = "idt,p9222";
reg = <0x61>;
- dev-name = "p9222";
/* Support p9412 GPIO */
idt,has_p9412_gpio;
