Merge "msm: camera: cpas: Fix bw voting units for interconnect" into camera-kernel.lnx.4.0 (da7a91d4) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_utils/cam_soc_icc.c

+5 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/interconnect.h>
		@@ -37,7 +37,8 @@ int cam_soc_bus_client_update_request(void *client, unsigned int idx)
		CAM_DBG(CAM_UTIL, "Bus client=[%s] index[%d]",
		bus_client->common_data->name, idx);

		rc = icc_set_bw(bus_client_data->icc_data, ab, ib);
		rc = icc_set_bw(bus_client_data->icc_data, Bps_to_icc(ab),
		Bps_to_icc(ib));
		if (rc) {
		CAM_ERR(CAM_UTIL,
		"Update request failed, client[%s], idx: %d",
		@@ -59,7 +60,8 @@ int cam_soc_bus_client_update_bw(void *client, uint64_t ab, uint64_t ib)

		CAM_DBG(CAM_UTIL, "Bus client=[%s] :ab[%llu] ib[%llu]",
		bus_client->common_data->name, ab, ib);
		rc = icc_set_bw(bus_client_data->icc_data, ab, ib);
		rc = icc_set_bw(bus_client_data->icc_data, Bps_to_icc(ab),
		Bps_to_icc(ib));
		if (rc) {
		CAM_ERR(CAM_UTIL, "Update request failed, client[%s]",
		bus_client->common_data->name);