From cb6c9fcea75d596f3ea030f1179093d4cedced60 Mon Sep 17 00:00:00 2001
From: Seiya Wang <seiya.wang@mediatek.com>
Date: Wed, 3 Jul 2024 10:35:26 +0800
Subject: [PATCH 1/2] ANDROID: GKI: Update symbol list for mtk

1 function symbol(s) added
  'int phy_create_lookup(struct phy*, const char*, const char*)'

Bug: 350828988
Bug: 351222890
Change-Id: If747b9e3acdf6e644ee23783f4997aff1d973e64
Signed-off-by: Seiya Wang <seiya.wang@mediatek.com>
(cherry picked from commit ce6f9cab9edca2712f312476ddc137f18c8ecfff)
---
 android/abi_gki_aarch64.stg | 17 +++++++++++++++++
 android/abi_gki_aarch64_mtk |  1 +
 2 files changed, 18 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 9d31b0ad5595..f255c569532e 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -333262,6 +333262,13 @@ function {
   parameter_id: 0x0917901f
   parameter_id: 0x10afcfdf
 }
+function {
+  id: 0x9f8801da
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0bfc9031
+  parameter_id: 0x3e10b518
+  parameter_id: 0x3e10b518
+}
 function {
   id: 0x9f89d33b
   return_type_id: 0x6720d32f
@@ -386515,6 +386522,15 @@ elf_symbol {
   type_id: 0x91ec6dfe
   full_name: "phy_connect_direct"
 }
+elf_symbol {
+  id: 0x2bf61c61
+  name: "phy_create_lookup"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x25d71c76
+  type_id: 0x9f8801da
+  full_name: "phy_create_lookup"
+}
 elf_symbol {
   id: 0x5b3ff607
   name: "phy_device_free"
@@ -415728,6 +415744,7 @@ interface {
   symbol_id: 0xc278f4fa
   symbol_id: 0x9c15bd7a
   symbol_id: 0x866cf90c
+  symbol_id: 0x2bf61c61
   symbol_id: 0x5b3ff607
   symbol_id: 0x3d4eb5a9
   symbol_id: 0x5ebc16d0
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
index bb18c96d361e..b67e7a36ee3f 100644
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -1894,6 +1894,7 @@
   phy_attached_info
   phy_connect
   phy_connect_direct
+  phy_create_lookup
   phy_disconnect
   phy_do_ioctl_running
   phy_drivers_register

From e06c78e3bdb601d12d09cdb6e26ae47f2c0ad39a Mon Sep 17 00:00:00 2001
From: Srinivasarao Pathipati <quic_c_spathi@quicinc.com>
Date: Mon, 8 Jul 2024 16:28:25 +0530
Subject: [PATCH 2/2] ANDROID: consolidate.fragment: don't disable
 CONFIG_PM_ADVANCED_DEBUG

ACK commit 4744b3a4ed72 ("ANDROID: GKI: Expose device async
to userspace") updates config dependency. Keep config
CONFIG_PM_ADVANCED_DEBUG enable to fix build issue with this
dependency change.

Bug: 352197598
Change-Id: I05a605fb9d3ce0905a60360a00e5f782b33d78eb
Signed-off-by: Srinivasarao Pathipati <quic_c_spathi@quicinc.com>
---
 arch/arm64/configs/consolidate.fragment | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/configs/consolidate.fragment b/arch/arm64/configs/consolidate.fragment
index ff0f1385054b..f3a96b2c73ce 100644
--- a/arch/arm64/configs/consolidate.fragment
+++ b/arch/arm64/configs/consolidate.fragment
@@ -42,7 +42,6 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_STAT=y
 # CONFIG_PERCPU_TEST is not set
 CONFIG_PID_IN_CONTEXTIDR=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set