Merge ec3ecad74212b65942ca321b03fac19a4014ebcc on remote branch (9d63d445) · Commits · e / devices / android_kernel_fairphone_FP4

asoc/msm-pcm-routing-v2.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -1166,10 +1166,13 @@ int msm_pcm_routing_get_stream_app_type_cfg(
		EXPORT_SYMBOL(msm_pcm_routing_get_stream_app_type_cfg);

		static struct cal_block_data *msm_routing_find_topology_by_path(int path,
		int cal_index)
		int cal_index,
		int app_type,
		int acdb_id)
		{
		struct list_head ptr, next;
		struct cal_block_data *cal_block = NULL;
		struct audio_cal_info_adm_top *cal_info;
		pr_debug("%s\n", __func__);

		list_for_each_safe(ptr, next,
		@@ -1180,9 +1183,11 @@ static struct cal_block_data *msm_routing_find_topology_by_path(int path,

		if (cal_utils_is_cal_stale(cal_block))
		continue;

		if (((struct audio_cal_info_adm_top *)cal_block
		->cal_info)->path == path) {
		cal_info = (struct audio_cal_info_adm_top *)
		cal_block->cal_info;
		if ((cal_info->path == path) &&
		(cal_info->app_type == app_type) &&
		(cal_info->acdb_id == acdb_id)) {
		return cal_block;
		}
		}
		@@ -1223,7 +1228,9 @@ static struct cal_block_data *msm_routing_find_topology(int path,
		"acdb_id %d %s\n", __func__, path, app_type, acdb_id,
		exact ? "fail" : "defaulting to search by path");
		return exact ? NULL : msm_routing_find_topology_by_path(path,
		cal_index);
		cal_index,
		app_type,
		acdb_id);
		}

		static int msm_routing_find_topology_on_index(int session_type, int app_type,

+8 −5

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/gpio.h>
		@@ -224,12 +225,14 @@ static int lpi_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned int function,

		pad = pctldev->desc->pins[pin].drv_data;

		if (pad != NULL) {
		pad->function = function;

		val = lpi_gpio_read(pad, LPI_GPIO_REG_VAL_CTL);
		val &= ~(LPI_GPIO_REG_FUNCTION_MASK);
		val \|= pad->function << LPI_GPIO_REG_FUNCTION_SHIFT;
		lpi_gpio_write(pad, LPI_GPIO_REG_VAL_CTL, val);
		}
		return 0;
		}