diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index d510bf4fed5d..578fcc3736a8 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1294,6 +1294,7 @@
       <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'/>
       <elf-symbol name='dev_pm_opp_set_clkname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x808c3e51'/>
+      <elf-symbol name='dev_pm_opp_set_prop_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xeaad849d'/>
       <elf-symbol name='dev_pm_opp_set_rate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x49f9212d'/>
       <elf-symbol name='dev_pm_opp_set_regulators' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc7f3109f'/>
       <elf-symbol name='dev_pm_opp_set_sharing_cpus' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3ef005c1'/>
@@ -1326,6 +1327,7 @@
       <elf-symbol name='devfreq_event_enable_edev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb723f5e0'/>
       <elf-symbol name='devfreq_event_get_edev_by_phandle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x324c4492'/>
       <elf-symbol name='devfreq_event_get_edev_count' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc7382d02'/>
+      <elf-symbol name='devfreq_event_get_event' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf8386da6'/>
       <elf-symbol name='devfreq_get_devfreq_by_node' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdf603074'/>
       <elf-symbol name='devfreq_get_devfreq_by_phandle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc4d3b5fc'/>
       <elf-symbol name='devfreq_monitor_resume' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x51d51cf8'/>
@@ -1408,6 +1410,7 @@
       <elf-symbol name='devm_devfreq_add_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa11123ba'/>
       <elf-symbol name='devm_devfreq_event_add_edev' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3054cdd5'/>
       <elf-symbol name='devm_devfreq_register_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1054639'/>
+      <elf-symbol name='devm_devfreq_register_opp_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9bc08c7f'/>
       <elf-symbol name='devm_devfreq_remove_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4d73b869'/>
       <elf-symbol name='devm_devfreq_unregister_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xde51fdbf'/>
       <elf-symbol name='devm_device_add_group' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x71021beb'/>
@@ -120358,6 +120361,11 @@
         <parameter type-id='80f4b756' name='name' filepath='drivers/opp/core.c' line='1865' column='1'/>
         <return type-id='e62a60bd'/>
       </function-decl>
+      <function-decl name='dev_pm_opp_set_prop_name' mangled-name='dev_pm_opp_set_prop_name' filepath='drivers/opp/core.c' line='1665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_set_prop_name'>
+        <parameter type-id='fa0b179b' name='dev' filepath='drivers/opp/core.c' line='1665' column='1'/>
+        <parameter type-id='80f4b756' name='name' filepath='drivers/opp/core.c' line='1665' column='1'/>
+        <return type-id='e62a60bd'/>
+      </function-decl>
       <function-decl name='dev_pm_opp_set_rate' mangled-name='dev_pm_opp_set_rate' filepath='drivers/opp/core.c' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_pm_opp_set_rate'>
         <parameter type-id='fa0b179b' name='dev' filepath='drivers/opp/core.c' line='914' column='1'/>
         <parameter type-id='7359adad' name='target_freq' filepath='drivers/opp/core.c' line='914' column='1'/>
@@ -120527,6 +120535,11 @@
         <parameter type-id='80f4b756' name='phandle_name' filepath='drivers/devfreq/devfreq-event.c' line='266' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='devfreq_event_get_event' mangled-name='devfreq_event_get_event' filepath='drivers/devfreq/devfreq-event.c' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devfreq_event_get_event'>
+        <parameter type-id='88146159' name='edev' filepath='drivers/devfreq/devfreq-event.c' line='160' column='1'/>
+        <parameter type-id='d6184118' name='edata' filepath='drivers/devfreq/devfreq-event.c' line='161' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='devfreq_get_devfreq_by_node' mangled-name='devfreq_get_devfreq_by_node' filepath='drivers/devfreq/devfreq.c' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devfreq_get_devfreq_by_node'>
         <parameter type-id='9a537bbe' name='node' filepath='drivers/devfreq/devfreq.c' line='993' column='1'/>
         <return type-id='f66fa7f4'/>
@@ -120957,6 +120970,11 @@
         <parameter type-id='f0981eeb' name='list' filepath='drivers/devfreq/devfreq.c' line='2081' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='devm_devfreq_register_opp_notifier' mangled-name='devm_devfreq_register_opp_notifier' filepath='drivers/devfreq/devfreq.c' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_devfreq_register_opp_notifier'>
+        <parameter type-id='fa0b179b' name='dev' filepath='drivers/devfreq/devfreq.c' line='1964' column='1'/>
+        <parameter type-id='f66fa7f4' name='devfreq' filepath='drivers/devfreq/devfreq.c' line='1965' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='devm_devfreq_remove_device' mangled-name='devm_devfreq_remove_device' filepath='drivers/devfreq/devfreq.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_devfreq_remove_device'>
         <parameter type-id='fa0b179b' name='dev' filepath='drivers/devfreq/devfreq.c' line='1063' column='1'/>
         <parameter type-id='f66fa7f4' name='devfreq' filepath='drivers/devfreq/devfreq.c' line='1063' column='1'/>
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 35e00367f944..22214f52813e 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -57,6 +57,7 @@
   clk_prepare
   clk_put
   clk_register
+  clk_round_rate
   clk_set_phase
   clk_set_rate
   clk_unprepare
@@ -77,6 +78,8 @@
   cpu_number
   __cpu_online_mask
   __cpu_possible_mask
+  cpus_read_lock
+  cpus_read_unlock
   crypto_destroy_tfm
   crypto_inc
   __crypto_memneq
@@ -96,6 +99,7 @@
   destroy_workqueue
   _dev_err
   dev_err_probe
+  devfreq_recommended_opp
   dev_fwnode
   device_add_disk
   device_create
@@ -149,9 +153,11 @@
   __devm_reset_control_get
   devm_snd_dmaengine_pcm_register
   devm_snd_soc_register_component
+  dev_pm_opp_find_freq_ceil
   dev_pm_opp_get_opp_count
   dev_pm_opp_get_voltage
   dev_pm_opp_put
+  dev_pm_opp_remove
   devres_add
   devres_alloc_node
   devres_free
@@ -297,6 +303,8 @@
   mutex_unlock
   no_llseek
   nr_cpu_ids
+  nvmem_cell_put
+  nvmem_cell_read
   of_alias_get_id
   of_clk_add_provider
   of_clk_del_provider
@@ -321,8 +329,10 @@
   of_match_device
   of_match_node
   of_node_name_eq
+  of_nvmem_cell_get
   of_parse_phandle
   of_phy_simple_xlate
+  of_property_count_elems_of_size
   of_property_read_string
   of_property_read_string_helper
   of_property_read_u32_index
@@ -409,6 +419,7 @@
   regulator_list_voltage_linear_range
   regulator_map_voltage_linear
   regulator_map_voltage_linear_range
+  regulator_set_voltage
   regulator_set_voltage_sel_regmap
   regulator_set_voltage_time_sel
   remap_pfn_range
@@ -483,6 +494,7 @@
   sysfs_remove_link
   system_wq
   __tasklet_schedule
+  thermal_zone_get_zone_by_name
   __traceiter_rwmmio_post_read
   __traceiter_rwmmio_read
   __traceiter_rwmmio_write
@@ -492,6 +504,7 @@
   __unregister_chrdev
   unregister_chrdev_region
   unregister_reboot_notifier
+  update_devfreq
   up_read
   up_write
   usleep_range
@@ -615,8 +628,6 @@
   cpufreq_dbs_governor_start
   cpufreq_dbs_governor_stop
   cpufreq_table_index_unsorted
-  cpus_read_lock
-  cpus_read_unlock
   dbs_update
   get_cpu_idle_time_us
   gov_update_cpu_data
@@ -683,7 +694,6 @@
 # required by gpio-regulator.ko
   devm_kstrdup
   gpiod_count
-  of_property_count_elems_of_size
 
 # required by gpio-rockchip.ko
   generic_handle_irq
@@ -1104,27 +1114,50 @@
 # required by rockchip_bus.ko
   cpufreq_register_notifier
   cpu_topology
-  devfreq_recommended_opp
-  regulator_set_voltage
 
 # required by rockchip_dmc.ko
+  cpufreq_cpu_get
+  cpufreq_cpu_put
+  cpufreq_quick_get
+  cpu_latency_qos_add_request
   cpu_latency_qos_update_request
+  devfreq_add_governor
   devfreq_event_disable_edev
   devfreq_event_enable_edev
   devfreq_event_get_edev_by_phandle
   devfreq_event_get_edev_count
+  devfreq_event_get_event
+  devfreq_monitor_resume
+  devfreq_monitor_start
+  devfreq_monitor_stop
+  devfreq_monitor_suspend
   devfreq_resume_device
   devfreq_suspend_device
+  devfreq_update_interval
+  devm_devfreq_add_device
+  devm_devfreq_register_opp_notifier
   _dev_notice
   dev_pm_opp_add
-  dev_pm_opp_find_freq_ceil
-  dev_pm_opp_remove
+  input_close_device
+  input_open_device
+  input_register_handle
+  input_register_handler
+  input_unregister_handle
   __memset_io
+  of_devfreq_cooling_register_power
   platform_get_irq_byname
 
 # required by rockchip_dmc_common.ko
   down_write_trylock
-  update_devfreq
+
+# required by rockchip_opp_select.ko
+  dev_pm_opp_get_opp_table
+  dev_pm_opp_of_add_table
+  dev_pm_opp_put_opp_table
+  dev_pm_opp_set_prop_name
+  of_find_node_opts_by_path
+  regulator_get_optional
+  regulator_put
 
 # required by rockchip_saradc.ko
   devm_iio_device_alloc
@@ -1139,9 +1172,6 @@
 
 # required by rockchip_thermal.ko
   devm_thermal_zone_of_sensor_register
-  nvmem_cell_put
-  nvmem_cell_read
-  of_nvmem_cell_get
   thermal_zone_device_disable
   thermal_zone_device_enable
   thermal_zone_device_update
@@ -1278,9 +1308,6 @@
   snd_pcm_hw_constraint_eld
   snd_soc_dapm_add_routes
 
-# required by snd-soc-rockchip-pdm.ko
-  clk_round_rate
-
 # required by snd-soc-simple-card-utils.ko
   devm_get_clk_from_child
   devm_kasprintf