diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 724b420fecb6..faabab4c3634 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -977,6 +977,7 @@
       <elf-symbol name='clk_register_fixed_factor' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf4e26a8a'/>
       <elf-symbol name='clk_register_fixed_rate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1594f658'/>
       <elf-symbol name='clk_register_gate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x92295424'/>
+      <elf-symbol name='clk_register_mux_table' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x556d2606'/>
       <elf-symbol name='clk_round_rate' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x43f81957'/>
       <elf-symbol name='clk_set_parent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2396c7f0'/>
       <elf-symbol name='clk_set_phase' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb7329c06'/>
@@ -5818,11 +5819,13 @@
       <elf-symbol name='balloon_aops' size='208' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x71fb77bb'/>
       <elf-symbol name='bpf_stats_enabled_key' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf84bd6ee'/>
       <elf-symbol name='clk_divider_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4ed3c288'/>
+      <elf-symbol name='clk_divider_ro_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xae330045'/>
       <elf-symbol name='clk_fixed_factor_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x274e799a'/>
       <elf-symbol name='clk_fixed_rate_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd484b507'/>
       <elf-symbol name='clk_fractional_divider_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcdcf81f5'/>
       <elf-symbol name='clk_gate_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5442693f'/>
       <elf-symbol name='clk_mux_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3348edd8'/>
+      <elf-symbol name='clk_mux_ro_ops' size='216' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb74e5c29'/>
       <elf-symbol name='console_drivers' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4822584'/>
       <elf-symbol name='console_printk' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2592fc6c'/>
       <elf-symbol name='console_suspend_enabled' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x366307a'/>
@@ -118431,6 +118434,7 @@
         <return type-id='48b5725f'/>
       </function-decl>
       <var-decl name='clk_divider_ops' type-id='92072f8b' mangled-name='clk_divider_ops' visibility='default' filepath='drivers/clk/clk-divider.c' line='453' column='1' elf-symbol-id='clk_divider_ops'/>
+      <var-decl name='clk_divider_ro_ops' type-id='92072f8b' mangled-name='clk_divider_ro_ops' visibility='default' filepath='drivers/clk/clk-divider.c' line='460' column='1' elf-symbol-id='clk_divider_ro_ops'/>
       <function-decl name='clk_enable' mangled-name='clk_enable' filepath='drivers/clk/clk.c' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_enable'>
         <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1160' column='1'/>
         <return type-id='95e97e5e'/>
@@ -118560,6 +118564,7 @@
         <return type-id='f0981eeb'/>
       </function-decl>
       <var-decl name='clk_mux_ops' type-id='92072f8b' mangled-name='clk_mux_ops' visibility='default' filepath='drivers/clk/clk-mux.c' line='136' column='1' elf-symbol-id='clk_mux_ops'/>
+      <var-decl name='clk_mux_ro_ops' type-id='92072f8b' mangled-name='clk_mux_ro_ops' visibility='default' filepath='drivers/clk/clk-mux.c' line='143' column='1' elf-symbol-id='clk_mux_ro_ops'/>
       <function-decl name='clk_notifier_register' mangled-name='clk_notifier_register' filepath='drivers/clk/clk.c' line='4396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_notifier_register'>
         <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='4396' column='1'/>
         <parameter type-id='d504f73d' name='nb' filepath='drivers/clk/clk.c' line='4396' column='1'/>
@@ -118644,6 +118649,20 @@
         <parameter type-id='cff2d845' name='lock' filepath='drivers/clk/clk-gate.c' line='187' column='1'/>
         <return type-id='7d0bc0eb'/>
       </function-decl>
+      <function-decl name='clk_register_mux_table' mangled-name='clk_register_mux_table' filepath='drivers/clk/clk-mux.c' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_register_mux_table'>
+        <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-mux.c' line='209' column='1'/>
+        <parameter type-id='80f4b756' name='name' filepath='drivers/clk/clk-mux.c' line='209' column='1'/>
+        <parameter type-id='13956559' name='parent_names' filepath='drivers/clk/clk-mux.c' line='210' column='1'/>
+        <parameter type-id='f9b06939' name='num_parents' filepath='drivers/clk/clk-mux.c' line='210' column='1'/>
+        <parameter type-id='7359adad' name='flags' filepath='drivers/clk/clk-mux.c' line='211' column='1'/>
+        <parameter type-id='eaa32e2f' name='reg' filepath='drivers/clk/clk-mux.c' line='211' column='1'/>
+        <parameter type-id='f9b06939' name='shift' filepath='drivers/clk/clk-mux.c' line='211' column='1'/>
+        <parameter type-id='19c2251e' name='mask' filepath='drivers/clk/clk-mux.c' line='211' column='1'/>
+        <parameter type-id='f9b06939' name='clk_mux_flags' filepath='drivers/clk/clk-mux.c' line='212' column='1'/>
+        <parameter type-id='f9409001' name='table' filepath='drivers/clk/clk-mux.c' line='212' column='1'/>
+        <parameter type-id='cff2d845' name='lock' filepath='drivers/clk/clk-mux.c' line='212' column='1'/>
+        <return type-id='7d0bc0eb'/>
+      </function-decl>
       <function-decl name='clk_round_rate' mangled-name='clk_round_rate' filepath='drivers/clk/clk.c' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_round_rate'>
         <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1479' column='1'/>
         <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='1479' column='1'/>
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 99e4492f8021..c6ef62b0e367 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -10,6 +10,7 @@
   __arch_copy_to_user
   arm64_const_caps_ready
   arm64_use_ng_mappings
+  __arm_smccc_smc
   atomic_notifier_chain_register
   bdget_disk
   bdput
@@ -50,6 +51,8 @@
   clk_get
   __clk_get_name
   clk_get_rate
+  clk_notifier_register
+  clk_notifier_unregister
   clk_prepare
   clk_put
   clk_register
@@ -232,6 +235,7 @@
   input_ff_create_memless
   input_register_device
   input_set_abs_params
+  iounmap
   irq_set_irq_wake
   jiffies
   kasan_flag_enabled
@@ -294,10 +298,13 @@
   of_get_next_child
   of_get_property
   of_get_regulator_init_data
+  of_iomap
   of_irq_get_byname
+  of_machine_is_compatible
   of_match_device
   of_match_node
   of_node_name_eq
+  of_parse_phandle
   of_phy_simple_xlate
   of_property_read_string
   of_property_read_string_helper
@@ -313,6 +320,7 @@
   __per_cpu_offset
   pinctrl_lookup_state
   pinctrl_select_state
+  __platform_driver_probe
   __platform_driver_register
   platform_driver_unregister
   platform_get_irq
@@ -335,6 +343,7 @@
   preempt_schedule
   preempt_schedule_notrace
   prepare_to_wait_event
+  print_hex_dump
   printk
   put_device
   put_disk
@@ -345,6 +354,7 @@
   queue_delayed_work_on
   queue_work_on
   ___ratelimit
+  rational_best_approximation
   _raw_spin_lock
   _raw_spin_lock_bh
   _raw_spin_lock_irqsave
@@ -498,6 +508,38 @@
   of_clk_add_hw_provider
   of_clk_hw_simple_get
 
+# required by clk-rockchip.ko
+  clk_divider_ops
+  clk_divider_ro_ops
+  clk_fixed_factor_ops
+  clk_fractional_divider_ops
+  clk_gate_ops
+  __clk_get_hw
+  clk_get_parent
+  clk_hw_get_flags
+  clk_hw_get_name
+  clk_hw_get_parent
+  clk_hw_get_rate
+  clk_hw_register_composite
+  clk_hw_round_rate
+  __clk_mux_determine_rate
+  clk_mux_ops
+  clk_mux_ro_ops
+  clk_register_composite
+  clk_register_divider_table
+  clk_register_fixed_factor
+  clk_register_gate
+  clk_register_mux_table
+  devm_clk_register
+  divider_get_val
+  gcd
+  kmemdup
+  match_string
+  of_clk_src_onecell_get
+  register_restart_handler
+  reset_controller_register
+  __udelay
+
 # required by clk-scmi.ko
   clk_hw_set_rate_range
   of_clk_hw_onecell_get
@@ -667,8 +709,6 @@
   rt_mutex_unlock
 
 # required by i2c-rk3x.ko
-  clk_notifier_register
-  clk_notifier_unregister
   i2c_parse_fw_timings
 
 # required by industrialio-buffer-cb.ko
@@ -808,7 +848,6 @@
   __do_once_start
   flush_workqueue
   __ioremap
-  iounmap
   mempool_alloc
   mempool_create_node
   mempool_destroy
@@ -857,7 +896,6 @@
 # required by optee.ko
   alloc_pages_exact
   __arm_smccc_hvc
-  __arm_smccc_smc
   device_property_read_string
   device_register
   find_vma
@@ -905,7 +943,6 @@
   of_find_i2c_adapter_by_node
   of_get_display_timing
   of_get_drm_display_mode
-  of_parse_phandle
   videomode_from_timing
 
 # required by phy-rockchip-inno-dsidphy.ko
@@ -1022,7 +1059,6 @@
   nvmem_cell_put
   nvmem_cell_read
   of_nvmem_cell_get
-  print_hex_dump
   thermal_zone_device_disable
   thermal_zone_device_enable
   thermal_zone_device_update
@@ -1150,12 +1186,8 @@
   snd_pcm_hw_constraint_eld
   snd_soc_dapm_add_routes
 
-# required by snd-soc-rk3328.ko
-  of_machine_is_compatible
-
 # required by snd-soc-rockchip-pdm.ko
   clk_round_rate
-  rational_best_approximation
 
 # required by snd-soc-simple-card-utils.ko
   devm_get_clk_from_child