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

Commit 3e8eac83 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (54e6ca5c) into msm-5.4 



* refs/heads/tmp-54e6ca5c:
  ANDROID: ABI: Update allowed list for EXYNOS
  ANDROID: GKI: add abi_gki_aarch64_oneplus
  ANDROID: GKI: prevent removal of monitored symbols
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: Update allowed list for EXYNOS
  ANDROID: GKI: add abi_gki_aarch64_galaxy
  UPSTREAM: module: Correctly truncate sysfs sections output
  Revert "ANDROID: Revert "module: Do not expose section addresses to non-CAP_SYSLOG""
  Revert "ANDROID: Revert "module: Refactor section attr into bin attribute""
  Revert "ANDROID: vendor_hooks: Add vendor hooks for key combination"
  Revert "ANDROID: fix i386 build break"
  ANDROID: fix i386 build break
  ANDROID: vendor_hooks: Add vendor hooks for key combination
  ANDROID: ABI: Update allowed list for QCOM
  FROMLIST: power: supply: core: property to control reverse charge
  FROMLIST: power: supply: core: add wireless signal strength property
  FROMLIST: power: supply: core: add wireless charger adapter type property
  FROMLIST: power: supply: core: add quick charge type property

Conflicts:
	android/abi_gki_aarch64_qcom

Change-Id: I97977300f5ba7dfb546835a94637b25b551edcbf
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 4b9bef81 54e6ca5c

Documentation/ABI/testing/sysfs-class-power

+85 −0
Original line number Diff line number Diff line
@@ -709,3 +709,88 @@ Description: 


		Access: Read

		Valid values: 1-31



What:		/sys/class/power_supply/<supply_name>/quick_charge_type

Date:		Jul 2020

Contact:	Fei Jiang <jiangfei1@xiaomi.com>

		Description:

		Reports the kind of quick charge type based on different adapter power.

		Different quick charge type represent different charging power.

		QUICK_CHARGE_NORMAL : Charging Power <= 10W

		QUICK_CHARGE_FAST : 10W < Charging Power <= 20W

		QUICK_CHARGE_FLASH : 20W < Charging Power <= 30W

		QUICK_CHARGE_TURBE : 30W < Charging Power <= 50W

		QUICK_CHARGE_SUPER : Charging Power > 50W



		Access: Read-Only

		Valid values:

			0: QUICK_CHARGE_NORMAL,

			1: QUICK_CHARGE_FAST,

			2: QUICK_CHARGE_FLASH,

			3: QUICK_CHARGE_TURBE,

			4: QUICK_CHARGE_SUPER.



===== Wireless Charger Properties =====

What:		/sys/class/power_supply/<supply_name>/tx_adapter

Date:		Jul 2020

Contact:	Fei Jiang <jiangfei1@xiaomi.com>

Description:

		Reports the type of wireless adapter connection is currently active for

		the supply, for example it can show if ADAPTER_PD capable source

		is attached. Expect common wireless adapter type, also increase by

		some vendor private adapter type(ex. ADAPTER_PD_40W).



		Access: Read-Only

		Valid values:

			0: ADAPTER_NONE,

			1: ADAPTER_SDP,

			2: ADAPTER_DCP,

			3: ADAPTER_CDP,

			4: ADAPTER_OCP,

			5: ADAPTER_QC2,

			6: ADAPTER_QC3,

			7: ADAPTER_PD,

			8: ADAPTER_AUTH_FAILED,

			9: ADAPTER_PRIVATE_QC3,

			10: ADAPTER_PRIVATE_PD,

			11: ADAPTER_CAR_POWER,

			12: ADAPTER_PRIVATE_PD_40W,

			13: ADAPTER_VOICE_BOX,

			14: ADAPTER_PRIVATE_PD_50W.



What:		/sys/class/power_supply/<supply_name>/signal_strength

Date:		Jul 2020

Contact:	Fei Jiang <jiangfei1@xiaomi.com>

Description:

		In PING phase, RX transmits a signal strength packet as the

		first communication packet to instruct the base to keep power

		signal on.The value reports wireless signal strength and show

		degree of coupling.



		The Qi Wireless Power Transfer System is published by the

		Wireless Power Consortium.The ping phase is the necessary stage

		for matching transmitter and receiver. In this phase,the Power

		Transmitter executes a Digital Ping, and listens for a response.

		If the Power Transmitter discovers a Power Receiver, the Power

		Transmitter may extend the Digital Ping,i.e. maintain the Power

		Signal at the level of the Digital Ping. This causes the system

		to proceed to the identification & configuration phase. If the

		Power Transmitter does not extend the Digital Ping, the system

		shall revert to the selection phase.



		Access: Read-Only

		Valid values: 0 - 100



What:		/sys/class/power_supply/<supply_name>/reverse_chg_mode

Date:		Jul 2020

Contact:	Fei Jiang <jiangfei1@xiaomi.com>

Description:

		Some devices support wireless reverse charge function which

		charge other devices.The property provider interface to

		enable/disable wireless reverse charge.If enabled, start TX

		mode and detect RX. Disabled when timeout or manual setting.



		Access: Read, Write

		Valid values:

		- 1: enabled

		- 0: disabled

android/abi_gki_aarch64.xml

+2365 −1488

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_d6430e6763.xml

+617 −571

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_exynos

+12 −0
Original line number Diff line number Diff line
@@ -147,11 +147,14 @@ 
  cpufreq_register_driver

  cpufreq_register_notifier

  cpufreq_table_index_unsorted

  cpufreq_unregister_notifier

  __cpuhp_setup_state

  __cpuhp_setup_state_cpuslocked

  cpuhp_tasks_frozen

  cpu_hwcap_keys

  cpu_hwcaps

  cpuidle_pause_and_lock

  cpuidle_resume_and_unlock

  cpumask_next

  cpumask_next_and

  cpu_number
@@ -306,6 +309,7 @@ 
  dma_async_tx_descriptor_init

  dma_buf_attach

  dma_buf_begin_cpu_access

  dma_buf_begin_cpu_access_partial

  dma_buf_detach

  dma_buf_end_cpu_access

  dma_buf_end_cpu_access_partial
@@ -752,6 +756,7 @@ 
  netif_carrier_on

  netif_napi_add

  netif_receive_skb

  netif_receive_skb_list

  netif_rx

  netif_tx_wake_queue

  no_llseek
@@ -1310,6 +1315,12 @@ 
  tasklet_init

  tasklet_kill

  __tasklet_schedule

  tcp_register_congestion_control

  tcp_reno_cong_avoid

  tcp_reno_ssthresh

  tcp_reno_undo_cwnd

  tcp_slow_start

  tcp_unregister_congestion_control

  thermal_cooling_device_unregister

  thermal_of_cooling_device_register

  thermal_zone_device_update
@@ -1328,6 +1339,7 @@ 
  trace_event_reg

  trace_handle_return

  trace_output_call

  __tracepoint_android_vh_ipi_stop

  __tracepoint_android_vh_is_fpsimd_save

  __tracepoint_device_pm_callback_end

  __tracepoint_device_pm_callback_start

android/abi_gki_aarch64_galaxy

0 → 100644
+2644 −0

File added.

Preview size limit exceeded, changes collapsed.