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

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

Merge "msm: camera: ife: add ISP HW Manager" into msm-4.9

parents d233a837 6b7522cd

drivers/media/platform/msm/camera/cam_isp/cam_isp_dev.c

+7 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * GNU General Public License for more details.

 */





#include <linux/delay.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -24,6 +23,7 @@ 
#include "cam_isp_dev.h"

#include "cam_isp_log.h"

#include "cam_hw_mgr_intf.h"

#include "cam_isp_hw_mgr_intf.h"

#include "cam_node.h"



static struct cam_isp_dev g_isp_dev;
@@ -72,7 +72,12 @@ static int cam_isp_dev_probe(struct platform_device *pdev) 
	}

	node = (struct cam_node *) g_isp_dev.sd.token;



	/* Initialize the context list */

	rc = cam_isp_hw_mgr_init(pdev->dev.of_node, &hw_mgr_intf);

	if (rc != 0) {

		pr_err("%s: Can not initialized ISP HW manager!\n", __func__);

		goto unregister;

	}



	for (i = 0; i < CAM_CTX_MAX; i++) {

		rc = cam_isp_context_init(&g_isp_dev.ctx_isp[i],

			&g_isp_dev.ctx[i],
@@ -84,7 +89,6 @@ static int cam_isp_dev_probe(struct platform_device *pdev) 
		}

	}



	/* Initialize the cam node */

	rc = cam_node_init(node, &hw_mgr_intf, g_isp_dev.ctx, CAM_CTX_MAX,

		CAM_ISP_DEV_NAME);

	if (rc) {
@@ -126,4 +130,3 @@ module_init(cam_isp_dev_init_module); 
module_exit(cam_isp_dev_exit_module);

MODULE_DESCRIPTION("MSM ISP driver");

MODULE_LICENSE("GPL v2");

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/Makefile

+11 −0
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_core

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cdm

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/irq_controller

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include



obj-$(CONFIG_SPECTRA_CAMERA) += hw_utils/ isp_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp_hw_mgr.o cam_ife_hw_mgr.o