diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index a05d9265a6a8..834d83949ddc 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -100,6 +100,7 @@
+
@@ -741,6 +742,7 @@
+
@@ -767,6 +769,7 @@
+
@@ -2012,11 +2015,16 @@
+
+
+
+
+
@@ -2202,6 +2210,7 @@
+
@@ -4732,6 +4741,7 @@
+
@@ -22458,6 +22468,7 @@
+
@@ -24695,6 +24706,12 @@
+
+
+
+
+
+
@@ -97734,21 +97751,21 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -114819,6 +114836,12 @@
+
+
+
+
+
+
@@ -118726,6 +118749,12 @@
+
+
+
+
+
+
@@ -118856,6 +118885,11 @@
+
+
+
+
+
@@ -124402,9 +124436,9 @@
-
-
-
+
+
+
@@ -124437,9 +124471,9 @@
-
-
-
+
+
+
@@ -125411,11 +125445,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125434,10 +125480,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -126394,6 +126456,12 @@
+
+
+
+
+
+
@@ -135923,6 +135991,7 @@
+
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index df7fff3de5f9..1055e6e22f07 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -8,6 +8,7 @@
__alloc_pages_nodemask
__alloc_skb
alloc_workqueue
+ anon_inode_getfd
__arch_copy_from_user
__arch_copy_to_user
arm64_const_caps_ready
@@ -88,6 +89,7 @@
clk_hw_get_flags
clk_hw_get_name
clk_hw_get_parent
+ clk_hw_get_parent_by_index
clk_hw_get_rate
__clk_mux_determine_rate
clk_notifier_register
@@ -238,6 +240,7 @@
devm_kmalloc
devm_kmemdup
devm_kstrdup
+ devm_led_classdev_register_ext
devm_mfd_add_devices
devm_nvmem_register
devm_of_clk_add_hw_provider
@@ -285,6 +288,7 @@
dev_pm_opp_register_set_opp_helper
dev_pm_opp_set_rate
dev_pm_opp_set_regulators
+ dev_pm_opp_set_supported_hw
dev_pm_opp_unregister_set_opp_helper
dev_printk
devres_add
@@ -341,6 +345,7 @@
dma_unmap_page_attrs
dma_unmap_resource
dma_unmap_sg_attrs
+ down
down_read
down_write
driver_register
@@ -348,7 +353,6 @@
drm_add_edid_modes
drm_add_modes_noedid
drm_atomic_get_crtc_state
- drm_atomic_get_new_bridge_state
drm_atomic_get_new_connector_for_encoder
drm_atomic_helper_bridge_destroy_state
drm_atomic_helper_bridge_duplicate_state
@@ -530,6 +534,7 @@
gpiod_set_value_cansleep
gpiod_to_irq
gpio_free
+ gpio_request
gpio_to_desc
handle_nested_irq
handle_simple_irq
@@ -538,6 +543,16 @@
hdmi_drm_infoframe_pack
hdmi_infoframe_pack
hdmi_vendor_infoframe_pack
+ hid_debug
+ hid_hw_close
+ hid_hw_open
+ hid_hw_start
+ hid_hw_stop
+ hid_open_report
+ __hid_register_driver
+ __hid_request
+ hid_unregister_driver
+ hid_validate_values
hrtimer_cancel
hrtimer_forward
hrtimer_init
@@ -550,8 +565,10 @@
i2c_get_adapter
i2c_put_adapter
i2c_register_driver
+ i2c_smbus_read_byte
i2c_smbus_read_byte_data
i2c_smbus_read_i2c_block_data
+ i2c_smbus_read_word_data
i2c_smbus_write_byte_data
i2c_smbus_write_i2c_block_data
__i2c_smbus_xfer
@@ -574,9 +591,16 @@
init_timer_key
init_wait_entry
__init_waitqueue_head
+ input_allocate_device
input_event
+ input_ff_create_memless
+ input_free_device
+ input_mt_init_slots
+ input_mt_report_slot_state
input_register_device
+ input_set_abs_params
input_set_capability
+ input_unregister_device
iommu_attach_device
iommu_attach_group
iommu_detach_device
@@ -655,6 +679,8 @@
ktime_get_with_offset
kvfree
kvmalloc_node
+ led_classdev_register_ext
+ led_classdev_unregister
led_set_brightness_nosleep
led_trigger_register
led_trigger_unregister
@@ -697,7 +723,9 @@
mipi_dsi_host_unregister
misc_deregister
misc_register
+ mmc_cqe_request_done
mmc_of_parse
+ mmc_request_done
__mmdrop
mod_delayed_work_on
mod_timer
@@ -896,7 +924,6 @@
_raw_spin_lock_bh
_raw_spin_lock_irq
_raw_spin_lock_irqsave
- _raw_spin_trylock
_raw_spin_unlock
_raw_spin_unlock_bh
_raw_spin_unlock_irq
@@ -914,6 +941,7 @@
regcache_sync
register_pm_notifier
register_reboot_notifier
+ register_shrinker
regmap_bulk_read
regmap_bulk_write
regmap_field_read
@@ -985,6 +1013,7 @@
seq_putc
seq_puts
seq_read
+ set_page_dirty_lock
sg_alloc_table
sg_alloc_table_from_pages
sg_free_table
@@ -998,6 +1027,7 @@
simple_attr_release
simple_read_from_buffer
simple_strtol
+ simple_strtoul
single_open
single_release
skb_clone
@@ -1084,6 +1114,7 @@
sysfs_remove_file_ns
sysfs_remove_group
sysfs_remove_link
+ sysfs_streq
system_freezable_wq
system_long_wq
system_power_efficient_wq
@@ -1118,6 +1149,7 @@
__udelay
unregister_chrdev_region
unregister_reboot_notifier
+ unregister_shrinker
up
update_devfreq
up_read
@@ -1141,6 +1173,7 @@
usb_hcd_link_urb_to_ep
usb_hcd_resume_root_hub
usb_hcd_unlink_urb_from_ep
+ usb_hid_driver
usb_match_id
usbnet_change_mtu
usbnet_defer_kevent
@@ -1259,6 +1292,7 @@
vm_map_pages
vsnprintf
vunmap
+ vzalloc
wait_for_completion
wait_for_completion_timeout
__wake_up
@@ -1335,7 +1369,6 @@
complete_and_exit
dev_close
dev_open
- down
down_interruptible
down_timeout
eth_type_trans
@@ -1407,7 +1440,6 @@
sdio_writel
sdio_writew
set_cpus_allowed_ptr
- simple_strtoul
skb_copy
__skb_pad
skb_realloc_headroom
@@ -1533,7 +1565,6 @@
# required by clk-rockchip-regmap.ko
clk_hw_get_num_parents
- clk_hw_get_parent_by_index
divider_recalc_rate
divider_round_rate_parent
@@ -1545,6 +1576,7 @@
__clk_get_hw
clk_hw_register_composite
clk_hw_round_rate
+ clk_hw_set_parent
clk_mux_ops
clk_mux_ro_ops
clk_register_divider_table
@@ -1561,6 +1593,9 @@
scmi_driver_register
scmi_driver_unregister
+# required by cm3218.ko
+ i2c_smbus_write_word_data
+
# required by cpufreq-dt.ko
cpufreq_enable_boost_support
cpufreq_freq_attr_scaling_available_freqs
@@ -1595,7 +1630,6 @@
# required by cqhci.ko
devm_blk_ksm_init
- mmc_cqe_request_done
# required by cryptodev.ko
crypto_aead_setauthsize
@@ -1615,6 +1649,7 @@
crypto_unregister_algs
# required by display-connector.ko
+ drm_atomic_get_new_bridge_state
drm_probe_ddc
# required by dm9601.ko
@@ -1656,7 +1691,6 @@
mmc_regulator_set_ocr
mmc_regulator_set_vqmmc
mmc_remove_host
- mmc_request_done
sdio_signal_irq
sg_miter_next
sg_miter_start
@@ -1673,6 +1707,7 @@
bitmap_find_next_zero_area_off
__bitmap_set
phy_reset
+ _raw_spin_trylock
usb_add_gadget_udc
usb_del_gadget_udc
usb_ep_set_maxpacket_limit
@@ -1729,6 +1764,16 @@
irq_get_domain_generic_chip
of_pinctrl_get
+# required by hid-alps.ko
+ input_alloc_absinfo
+ input_mt_sync_frame
+
+# required by hid-holtek-kbd.ko
+ usb_ifnum_to_if
+
+# required by hid-primax.ko
+ hid_report_raw_event
+
# required by i2c-dev.ko
bus_register_notifier
bus_unregister_notifier
@@ -1745,11 +1790,9 @@
# required by i2c-hid.ko
hid_add_device
hid_allocate_device
- hid_debug
hid_destroy_device
hid_input_report
hid_parse_report
- i2c_smbus_read_byte
# required by i2c-mux.ko
__i2c_transfer
@@ -1782,9 +1825,6 @@
# required by kfifo_buf.ko
__kfifo_to_user
-# required by leds-gpio.ko
- devm_led_classdev_register_ext
-
# required by leds-rgb13h.ko
led_classdev_flash_register_ext
led_classdev_flash_unregister
@@ -1925,7 +1965,6 @@
hwrng_unregister
# required by optee.ko
- anon_inode_getfd
alloc_pages_exact
__arm_smccc_hvc
bus_for_each_dev
@@ -2062,7 +2101,6 @@
kernel_kobj
# required by rfkill-rk.ko
- gpio_request
kstrtoll
rfkill_init_sw_state
rfkill_set_hw_state
@@ -2186,7 +2224,6 @@
# required by rockchip-cpufreq.ko
cpufreq_unregister_notifier
dev_pm_opp_put_prop_name
- dev_pm_opp_set_supported_hw
# required by rockchip-rng.ko
devm_hwrng_register
@@ -2451,6 +2488,10 @@
sdhci_remove_host
sdhci_request
+# required by sensor_dev.ko
+ class_create_file_ns
+ class_remove_file_ns
+
# required by sha1-ce.ko
crypto_sha1_finup
crypto_sha1_update
@@ -2558,7 +2599,6 @@
__get_task_comm
# required by tcpci_husb311.ko
- i2c_smbus_read_word_data
tcpci_get_tcpm_port
tcpci_irq
tcpci_register_port
@@ -2671,7 +2711,6 @@
# required by videobuf2-cma-sg.ko
frame_vector_to_pages
- set_page_dirty_lock
split_page
vb2_common_vm_ops
vb2_create_framevec
@@ -2703,9 +2742,7 @@
__num_online_cpus
page_endio
register_blkdev
- sysfs_streq
unregister_blkdev
- vzalloc
# required by zsmalloc.ko
alloc_anon_inode
@@ -2724,7 +2761,5 @@
_raw_read_unlock
_raw_write_lock
_raw_write_unlock
- register_shrinker
__SetPageMovable
unlock_page
- unregister_shrinker