summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Wang <jwangh@google.com>2023-04-01 03:14:49 +0000
committerJing Wang <jwangh@google.com>2023-04-01 03:45:25 +0000
commit15940f2fa8820708fe103da03d6110e4fa7141d7 (patch)
treeb863c1dbc56aa424dcd2448ef6aa3c0a5d09ee79
parent99635e4b639418e600e1f3882e76ad8733dd891d (diff)
downloadgoodix_touch-15940f2fa8820708fe103da03d6110e4fa7141d7.tar.gz
Revert "touch/goodix: Support getting panel id from gti"
Revert submission 2439090-touch-multi-offload-id Reason for revert: b/276521272 Reverted changes: /q/submissionid:2439090-touch-multi-offload-id Change-Id: Ib3665f2e32806d8edd7085e1df2295276165ff2e
-rw-r--r--goodix_ts_core.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c
index 8bd1460..21f0b7b 100644
--- a/goodix_ts_core.c
+++ b/goodix_ts_core.c
@@ -1269,9 +1269,6 @@ static int goodix_parse_dt(
struct of_phandle_args panelmap;
struct drm_panel *panel = NULL;
const char *name;
-#if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE)
- int panel_id = -1;
-#endif
if (!board_data) {
ts_err("invalid board data");
@@ -1351,17 +1348,7 @@ static int goodix_parse_dt(
if (board_data->use_one_binary)
ts_info("use one binary");
-#if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE)
- panel_id = goog_get_panel_id(node);
- if (panel_id >= 0) {
- goog_get_firmware_name(node, panel_id, board_data->fw_name, sizeof(board_data->fw_name));
- if (!board_data->use_one_binary)
- goog_get_config_name(node, panel_id, board_data->cfg_bin_name, sizeof(board_data->cfg_bin_name));
- goog_get_test_limits_name(node, panel_id, board_data->test_limits_name, sizeof(board_data->test_limits_name));
- } else if (of_property_read_bool(node, "goodix,panel_map")) {
-#else
if (of_property_read_bool(node, "goodix,panel_map")) {
-#endif
for (index = 0;; index++) {
r = of_parse_phandle_with_fixed_args(
node, "goodix,panel_map", 1, index, &panelmap);