Merge 5ef8b141314ab98608acfb06047c52b17b2a68d2 on remote branch (8b0e1588) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_cpas/cam_cpas_hw.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -782,6 +782,20 @@ static int cam_cpas_util_apply_client_axi_vote(
		}
		mnoc_axi_port_updated[i] = true;
		}

		for (i = 0; i < cpas_core->num_camnoc_axi_ports; i++) {
		if (axi_vote->axi_path[0].camnoc_bw) {
		/* start case */
		cpas_core->camnoc_axi_port[i].additional_bw +=
		CAM_CPAS_DEFAULT_AXI_BW;
		} else {
		/* stop case */
		cpas_core->camnoc_axi_port[i].additional_bw -=
		CAM_CPAS_DEFAULT_AXI_BW;
		}
		camnoc_axi_port_updated[i] = true;
		}

		goto vote_start_clients;
		}

+1 −1

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

		#ifndef _CAM_CPAS_HW_INTF_H_

+1 −1

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

		#include <linux/of.h>

+1 −1

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

		#ifndef _CAM_VFE_SOC_H_

+27 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,32 @@ static struct cam_vfe_rdi_reg_data vfe_170_150_rdi_2_data = {
		.reg_update_irq_mask = 0x80,
		};

		struct cam_vfe_top_dump_data vfe170_150_dump_data = {
		.num_reg_dump_entries = 2,
		.num_lut_dump_entries = 1,
		.dmi_cfg = 0xc24,
		.dmi_addr = 0xc28,
		.dmi_data_path_hi = 0xc2C,
		.dmi_data_path_lo = 0xc30,
		.reg_entry = {
		{
		.reg_dump_start = 0x0,
		.reg_dump_end = 0xF94,
		},
		{
		.reg_dump_start = 0x2000,
		.reg_dump_end = 0x3578,
		},
		},
		.lut_entry = {
		{
		.lut_word_size = 64,
		.lut_bank_sel = 0x40,
		.lut_addr_size = 180,
		},
		},
		};

		static struct cam_vfe_top_ver2_hw_info vfe170_150_top_hw_info = {
		.common_reg = &vfe170_150_top_common_reg,
		.camif_hw_info = {
		@@ -185,6 +211,7 @@ static struct cam_vfe_top_ver2_hw_info vfe170_150_top_hw_info = {
		CAM_VFE_RDI_VER_1_0,
		CAM_VFE_RDI_VER_1_0,
		},
		.dump_data = &vfe170_150_dump_data,
		};

		static struct cam_irq_register_set vfe170_150_bus_irq_reg[3] = {