Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ae4487 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

0a5d2ddf ANDROID: GKI: update symbol list for xiaomi
6b6b8dc6 ANDROID: GKI: Update abi_gki_aarch64_oplus

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id8c39c1d026b42b74cef33a9130947cb463b5d95
parents a8aa69c6 0a5d2ddf

android/abi_gki_aarch64.xml

+8 −0
Original line number Diff line number Diff line
@@ -3967,6 +3967,7 @@ 
      <elf-symbol name='spi_bus_lock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1001acda'/>

      <elf-symbol name='spi_bus_unlock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4861f1cc'/>

      <elf-symbol name='spi_busnum_to_master' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x40920415'/>

      <elf-symbol name='spi_set_cs_timing' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe80f6172'/>

      <elf-symbol name='spi_controller_resume' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3b6b9b70'/>

      <elf-symbol name='spi_controller_suspend' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9e6ee413'/>

      <elf-symbol name='spi_finalize_current_message' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x71c101fd'/>
@@ -128658,6 +128659,13 @@ 
        <parameter type-id='f22e4524' name='ctlr' filepath='drivers/spi/spi.c' line='2705' column='1'/>

        <return type-id='95e97e5e'/>

      </function-decl>

      <function-decl name='spi_set_cs_timing' mangled-name='spi_set_cs_timing' filepath='drivers/spi/spi.c' line='3225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spi_set_cs_timing'>

        <parameter type-id='e90f4666' name='spi' filepath='drivers/spi/spi.c' line='3225' column='1'/>

        <parameter type-id='f9b06939' name='setup' filepath='drivers/spi/spi.c' line='3225' column='1'/>

        <parameter type-id='f9b06939' name='hold' filepath='drivers/spi/spi.c' line='3225' column='1'/>

        <parameter type-id='f9b06939' name='inactive_dly' filepath='drivers/spi/spi.c' line='3226' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='spi_busnum_to_master' mangled-name='spi_busnum_to_master' filepath='drivers/spi/spi.c' line='2741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spi_busnum_to_master'>

        <parameter type-id='1dc6a898' name='bus_num' filepath='drivers/spi/spi.c' line='2741' column='1'/>

        <return type-id='f22e4524'/>

android/abi_gki_aarch64_oplus

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
  remove_proc_subtree

  request_firmware

  rtc_time64_to_tm

  spi_set_cs_timing

  spi_sync

  strcat

  system_wq

android/abi_gki_aarch64_xiaomi

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 
  regcache_drop_region

  snd_soc_dapm_del_routes



# required by us_prox.ko

  iio_device_unregister

  iio_device_free

  __iio_device_register

  __kfifo_to_user

  iio_device_alloc



# required by tfa98xx_dlkm.ko

  device_remove_bin_file

  snd_pcm_hw_constraint_mask64
@@ -32,15 +39,21 @@ 


# required by msm_drm.ko

  kobject_set_name

  wakeup_source_destroy

  wakeup_source_remove

  wakeup_source_add

  wakeup_source_create



# required by exfat.ko

  block_write_full_page

  __blockdev_direct_IO

  __bread_gfp

  __brelse

  clear_nlink

  cont_write_begin

  d_find_alias

  d_move

  d_splice_alias

  filemap_fdatawait_range

  filemap_fdatawrite_range

  full_name_hash
@@ -53,6 +66,7 @@ 
  generic_fillattr

  generic_write_end

  __getblk_gfp

  igrab

  ilookup

  in_group_p

  inc_nlink
@@ -76,14 +90,20 @@ 
  sb_min_blocksize

  sb_set_blocksize

  setattr_copy

  setattr_prepare

  set_nlink

  sync_blockdev

  sync_dirty_buffer

  sync_mapping_buffers

  __remove_inode_hash

  touch_buffer

  truncate_pagecache

  truncate_setsize

  unload_nls

  unlock_buffer

  utf16s_to_utf8s

  utf8s_to_utf16s

  write_inode_now



# required by incrementalfs.ko

  revert_creds