diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 7803f1b50629..7df9cac0fd66 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1290,9 +1290,11 @@
       <elf-symbol name='dev_pm_opp_put' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe695dd5e'/>
       <elf-symbol name='dev_pm_opp_put_clkname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x57ff9b8d'/>
       <elf-symbol name='dev_pm_opp_put_opp_table' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x74c12cec'/>
+      <elf-symbol name='dev_pm_opp_put_prop_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3cbc7257'/>
       <elf-symbol name='dev_pm_opp_put_regulators' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x130c2d49'/>
       <elf-symbol name='dev_pm_opp_put_supported_hw' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4bdda8fc'/>
       <elf-symbol name='dev_pm_opp_register_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa570cc96'/>
+      <elf-symbol name='dev_pm_opp_register_set_opp_helper' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x160848ed'/>
       <elf-symbol name='dev_pm_opp_remove' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xce2ad915'/>
       <elf-symbol name='dev_pm_opp_remove_all_dynamic' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x58d2164f'/>
       <elf-symbol name='dev_pm_opp_set_bw' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xee324f7f'/>
@@ -120420,6 +120422,10 @@
         <parameter type-id='e62a60bd' name='opp_table' filepath='drivers/opp/core.c' line='1223' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='dev_pm_opp_put_prop_name' mangled-name='dev_pm_opp_put_prop_name' filepath='drivers/opp/core.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_put_prop_name'>
+        <parameter type-id='e62a60bd' name='opp_table' filepath='drivers/opp/core.c' line='1698' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='dev_pm_opp_put_regulators' mangled-name='dev_pm_opp_put_regulators' filepath='drivers/opp/core.c' line='1824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_put_regulators'>
         <parameter type-id='e62a60bd' name='opp_table' filepath='drivers/opp/core.c' line='1824' column='1'/>
         <return type-id='48b5725f'/>
@@ -120433,6 +120439,11 @@
         <parameter type-id='d504f73d' name='nb' filepath='drivers/opp/core.c' line='2388' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='dev_pm_opp_register_set_opp_helper' mangled-name='dev_pm_opp_register_set_opp_helper' filepath='drivers/opp/core.c' line='1930' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_register_set_opp_helper'>
+        <parameter type-id='fa0b179b' name='dev' filepath='drivers/opp/core.c' line='1930' column='1'/>
+        <parameter type-id='c1433076' name='set_opp' filepath='drivers/opp/core.c' line='1931' column='1'/>
+        <return type-id='e62a60bd'/>
+      </function-decl>
       <function-decl name='dev_pm_opp_remove' mangled-name='dev_pm_opp_remove' filepath='drivers/opp/core.c' line='1290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_remove'>
         <parameter type-id='fa0b179b' name='dev' filepath='drivers/opp/core.c' line='1290' column='1'/>
         <parameter type-id='7359adad' name='freq' filepath='drivers/opp/core.c' line='1290' column='1'/>
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 653e87ed2c3c..6c4930b55133 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -72,7 +72,9 @@
   completion_done
   __const_udelay
   __cpufreq_driver_target
+  cpufreq_generic_suspend
   cpufreq_register_governor
+  cpufreq_register_notifier
   cpufreq_unregister_governor
   cpu_have_feature
   __cpuhp_remove_state
@@ -178,6 +180,7 @@
   dev_pm_opp_find_freq_ceil
   dev_pm_opp_get_opp_count
   dev_pm_opp_get_voltage
+  dev_pm_opp_of_get_sharing_cpus
   dev_pm_opp_put
   dev_pm_opp_remove
   devres_add
@@ -297,6 +300,7 @@
   gen_pool_create
   gen_pool_destroy
   gen_pool_free_owner
+  get_cpu_device
   get_device
   gic_nonsecure_priorities
   gpiochip_add_pin_range
@@ -462,6 +466,7 @@
   of_parse_phandle
   of_phy_simple_xlate
   of_property_count_elems_of_size
+  of_property_match_string
   of_property_read_string
   of_property_read_string_helper
   of_property_read_u32_index
@@ -788,7 +793,6 @@
   cpufreq_freq_attr_scaling_boost_freqs
   cpufreq_generic_frequency_table_verify
   cpufreq_generic_get
-  cpufreq_generic_suspend
   cpufreq_register_driver
   cpufreq_unregister_driver
   dev_pm_opp_free_cpufreq_table
@@ -798,13 +802,11 @@
   dev_pm_opp_init_cpufreq_table
   dev_pm_opp_of_cpumask_add_table
   dev_pm_opp_of_cpumask_remove_table
-  dev_pm_opp_of_get_sharing_cpus
   dev_pm_opp_of_register_em
   dev_pm_opp_put_regulators
   dev_pm_opp_set_rate
   dev_pm_opp_set_regulators
   dev_pm_opp_set_sharing_cpus
-  get_cpu_device
   policy_has_boost_freq
 
 # required by cpufreq_ondemand.ko
@@ -1344,6 +1346,10 @@
   sync_file_create
   vmf_insert_mixed
 
+# required by rockchip-cpufreq.ko
+  dev_pm_opp_put_prop_name
+  dev_pm_opp_register_set_opp_helper
+
 # required by rockchip-iommu.ko
   bus_set_iommu
   get_zeroed_page
@@ -1373,7 +1379,6 @@
   phy_drivers_unregister
 
 # required by rockchip_bus.ko
-  cpufreq_register_notifier
   cpu_topology
 
 # required by rockchip_dmc.ko
@@ -1599,7 +1604,6 @@
   of_graph_get_port_by_id
   of_graph_get_remote_port
   of_graph_get_remote_port_parent
-  of_property_match_string
   platform_find_device_by_driver
   __platform_register_drivers
   platform_unregister_drivers