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

Commit 7aad4327 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AsoC: msm: Add App type and ACDB ID to RTAC"

parents 2f0da4dd 024e49b0

include/linux/qdsp6v2/rtac.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ struct rtac_cal_block_data { 
	struct rtac_cal_data		cal_data;

};



void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id);

void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id,

			u32 app_type, u32 acdb_dev_id);

void rtac_remove_adm_device(u32 port_id, u32 copp_id);

void rtac_remove_popp_from_adm_devices(u32 popp_id);

void rtac_add_voice(u32 cvs_handle, u32 cvp_handle, u32 rx_afe_port,

sound/soc/msm/qdsp6v2/q6adm.c

+3 −1
Original line number Diff line number Diff line
@@ -2090,7 +2090,9 @@ int adm_matrix_map(int path, struct route_payload payload_map, int perf_mode) 
					    atomic_read(&this_adm.copp.id

							[port_idx][copp_idx]),

					    get_cal_path(path),

					    payload_map.session_id);

					    payload_map.session_id,

					    payload_map.app_type,

					    payload_map.acdb_dev_id);

			send_adm_cal(payload_map.port_id[i], copp_idx,

				     get_cal_path(path), perf_mode,

				     payload_map.app_type,

sound/soc/msm/qdsp6v2/rtac.c

+6 −1
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ struct rtac_adm_data { 
	uint32_t		afe_port;

	uint32_t		copp;

	uint32_t		num_of_popp;

	uint32_t		app_type;

	uint32_t		acdb_dev_id;

	struct rtac_popp_data	popp[RTAC_MAX_ACTIVE_POPP];

};
@@ -396,7 +398,8 @@ done: 
	return;

}



void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id)

void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id,

			 u32 app_type, u32 acdb_id)

{

	u32 i = 0;

	pr_debug("%s: port_id = %d, popp_id = %d\n", __func__, port_id,
@@ -431,6 +434,8 @@ void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id) 
		adm_get_topology_for_port_from_copp_id(port_id, copp_id);

	rtac_adm_data.device[i].afe_port = port_id;

	rtac_adm_data.device[i].copp = copp_id;

	rtac_adm_data.device[i].app_type = app_type;

	rtac_adm_data.device[i].acdb_dev_id = acdb_id;

	rtac_adm_data.device[i].popp[

		rtac_adm_data.device[i].num_of_popp].popp = popp_id;

	rtac_adm_data.device[i].popp[