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

Commit 683872f3 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android11-5.4.86+ (e399f165) into msm-5.4 



* refs/heads/tmp-e399f165:
  ANDROID: GKI: add ufshcd_config_pwr_mode
  ANDROID: GKI: update symbol list for xiaomi
  ANDROID: GKI: Update abi_gki_aarch64_oplus

Change-Id: I1e49b2394445cde4776ff65f51ecd50818c2ba8d
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 15c30a28 e399f165

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.86_7d99cf8c84a7
 
LTS_5.4.86_e399f16519fa

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'/>
@@ -128457,6 +128458,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_7d99cf8c84a7.xml→android/abi_gki_aarch64_e399f16519fa.xml

+13 −13
Original line number Diff line number Diff line
@@ -94598,6 +94598,12 @@ 
        <parameter type-id='fa0b179b'/>

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

      </function-decl>

      <function-decl name='strscpy' mangled-name='strscpy' filepath='include/linux/string.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'>

        <parameter type-id='26a90f95'/>

        <parameter type-id='80f4b756'/>

        <parameter type-id='7359adad'/>

        <return type-id='bd54fe1a'/>

      </function-decl>

      <function-decl name='msleep' mangled-name='msleep' filepath='include/linux/delay.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='msleep'>

        <parameter type-id='f0981eeb'/>

        <return type-id='48b5725f'/>
@@ -128690,15 +128696,15 @@ 
        <parameter type-id='1ce53783'/>

        <return type-id='c894953d'/>

      </function-decl>

      <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'>

        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5319' column='1'/>

        <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5319' column='1'/>

        <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5320' column='1'/>

      <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'>

        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5322' column='1'/>

        <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5322' column='1'/>

        <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5323' column='1'/>

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

      </function-decl>

      <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'>

        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5326' column='1'/>

        <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5326' column='1'/>

      <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5329' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'>

        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5329' column='1'/>

        <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5329' column='1'/>

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

      </function-decl>

      <function-decl name='strnstr' mangled-name='strnstr' filepath='include/linux/string.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnstr'>
@@ -130490,12 +130496,6 @@ 
        <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='4553' column='1'/>

        <return type-id='f0981eeb'/>

      </function-decl>

      <function-decl name='strscpy' mangled-name='strscpy' filepath='include/linux/string.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'>

        <parameter type-id='26a90f95'/>

        <parameter type-id='80f4b756'/>

        <parameter type-id='7359adad'/>

        <return type-id='bd54fe1a'/>

      </function-decl>

      <function-decl name='ida_alloc_range' mangled-name='ida_alloc_range' filepath='include/linux/idr.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ida_alloc_range'>

        <parameter type-id='a9e764bb'/>

        <parameter type-id='f0981eeb'/>

android/abi_gki_aarch64_exynos

+1 −0
Original line number Diff line number Diff line
@@ -1598,6 +1598,7 @@ 
  uart_update_timeout

  uart_write_wakeup

  __udelay

  ufshcd_config_pwr_mode

  ufshcd_dme_get_attr

  ufshcd_dme_set_attr

  ufshcd_pltfrm_init

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