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

Commit a7b3d027 authored Jun 18, 2019 by Mukund Madhusudan Atre

msm: camera: isp: Move bw voting functions to common file for vfe

Currently, vfe top has different files for different targets. Some of
the APIs are unchanged between these files. In order to avoid duplication
of code and make sure no change is missed between different versions of
vfe top, a common file is added to vfe top for unchanged APIs. With the
common top, number of input resources are moved to architecture specific
header files to ensure special conditions need not be created for a
particular architecture in common code. Move bw voting related APIs to
this common file.

Change-Id: Ibcb9519a206c25d42c9e7f0336f8d588a8240717
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>

parent bad8da69

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe170.h

+2 −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-2019, The Linux Foundation. All rights reserved.
		*/

		#ifndef _CAM_VFE170_H_
		@@ -166,6 +166,7 @@ static struct cam_vfe_top_ver2_hw_info vfe170_top_hw_info = {
		NULL,
		},
		},
		.num_mux = 4,
		.mux_type = {
		CAM_VFE_CAMIF_VER_2_0,
		CAM_VFE_RDI_VER_1_0,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ static struct cam_vfe_top_ver2_hw_info vfe175_top_hw_info = {
		NULL,
		},
		},
		.num_mux = 5,
		.mux_type = {
		CAM_VFE_CAMIF_VER_2_0,
		CAM_VFE_RDI_VER_1_0,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175_130.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ static struct cam_vfe_top_ver2_hw_info vfe175_130_top_hw_info = {
		.fe_reg = &vfe175_130_fe_reg,
		.reg_data = &vfe_175_130_fe_reg_data,
		},
		.num_mux = 6,
		.mux_type = {
		CAM_VFE_CAMIF_VER_2_0,
		CAM_VFE_RDI_VER_1_0,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe480.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,7 @@ static struct cam_vfe_top_ver3_hw_info vfe480_top_hw_info = {
		.camif_lite_reg = &vfe480_camif_lcr,
		.reg_data = &vfe480_camif_lcr_reg_data,
		},
		.num_mux = 6,
		.mux_type = {
		CAM_VFE_CAMIF_VER_3_0,
		CAM_VFE_RDI_VER_1_0,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe_lite17x.h

+2 −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-2019, The Linux Foundation. All rights reserved.
		*/

		#ifndef _CAM_VFE_LITE17X_H_
		@@ -97,6 +97,7 @@ static struct cam_vfe_top_ver2_hw_info vfe17x_top_hw_info = {
		&vfe17x_rdi_3_data,
		},
		},
		.num_mux = 4,
		.mux_type = {
		CAM_VFE_RDI_VER_1_0,
		CAM_VFE_RDI_VER_1_0,