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

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

Merge "msm: isp: Use recommended ab and ib values for isp"

parents 57c48991 fcbd447a

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ struct msm_vfe_hardware_info { 
	struct msm_vfe_axi_hardware_info *axi_hw_info;

	struct msm_vfe_stats_hardware_info *stats_hw_info;

	uint32_t dmi_reg_offset;

	uint32_t min_ab;

	uint32_t min_ib;

};



struct msm_vfe_axi_hardware_info {

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2316,6 +2316,8 @@ struct msm_vfe_hardware_info vfe40_hw_info = { 
	.num_iommu_secure_ctx = 1,

	.vfe_clk_idx = VFE40_CLK_IDX,

	.runtime_axi_update = 0,

	.min_ab = 12000000,

	.min_ib = 12000000,

	.vfe_ops = {

		.irq_ops = {

			.read_irq_status = msm_vfe40_read_irq_status,

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1964,6 +1964,8 @@ struct msm_vfe_hardware_info vfe44_hw_info = { 
	.num_iommu_secure_ctx = 1,

	.vfe_clk_idx = VFE44_CLK_IDX,

	.runtime_axi_update = 0,

	.min_ab = 100000000,

	.min_ib = 100000000,

	.vfe_ops = {

		.irq_ops = {

			.read_irq_status = msm_vfe44_read_irq_status,

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2068,6 +2068,8 @@ struct msm_vfe_hardware_info vfe46_hw_info = { 
	.num_iommu_secure_ctx = 1,

	.vfe_clk_idx = VFE46_CLK_IDX,

	.runtime_axi_update = 0,

	.min_ab = 100000000,

	.min_ib = 100000000,

	.vfe_ops = {

		.irq_ops = {

			.read_irq_status = msm_vfe46_read_irq_status,

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+2 −0
Original line number Diff line number Diff line
@@ -2308,6 +2308,8 @@ struct msm_vfe_hardware_info vfe47_hw_info = { 
	.num_iommu_secure_ctx = 0,

	.vfe_clk_idx = VFE47_SRC_CLK_DTSI_IDX,

	.runtime_axi_update = 1,

	.min_ib = 100000000,

	.min_ab = 100000000,

	.vfe_ops = {

		.irq_ops = {

			.read_irq_status = msm_vfe47_read_irq_status,