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

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

Merge "Merge commit 'd1a9fffc' into msm-4.9 - PC113"

parents 78a8a503 e3713321

Documentation/devicetree/bindings/media/video/msm-cam-fd.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ about the device register map, interrupt map, clocks, regulators. 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,fd41".

  Definition: Should be one of "qcom,fd41", "qcom,fd501".



- reg-names

  Usage: optional

drivers/media/platform/msm/camera/cam_core/cam_hw_mgr_intf.h

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

/* Copyright (c) 2017-2018, 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
@@ -123,10 +123,12 @@ struct cam_hw_start_args { 
 * struct cam_hw_stop_args - Payload for stop command

 *

 * @ctxt_to_hw_map:        HW context from the acquire

 * @args:                  Arguments to pass for stop

 *

 */

struct cam_hw_stop_args {

	void              *ctxt_to_hw_map;

	void              *args;

};



/**

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cpastop_v170_110.h

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static struct cam_camnoc_specific 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x434, /* SPECIFIC_IFE02_PRIORITYLUT_HIGH */

			.value = 0x66665555,

			.value = 0x66666666,

		},

		.urgency = {

			.enable = true,
@@ -315,7 +315,7 @@ static struct cam_camnoc_specific 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x834, /* SPECIFIC_IFE13_PRIORITYLUT_HIGH */

			.value = 0x66665555,

			.value = 0x66666666,

		},

		.urgency = {

			.enable = true,

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -1092,6 +1092,7 @@ int cam_fd_hw_release(void *hw_priv, void *hw_release_args, uint32_t arg_size) 
		CAM_ERR(CAM_FD, "Release cdm handle failed, handle=0x%x, rc=%d",

			ctx_hw_private->cdm_handle, rc);



	kfree(ctx_hw_private->cdm_cmd);

	kfree(ctx_hw_private);

	release_args->ctx_hw_private = NULL;

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_dev.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -22,6 +22,7 @@ 
#include "cam_fd_hw_core.h"

#include "cam_fd_hw_soc.h"

#include "cam_fd_hw_v41.h"

#include "cam_fd_hw_v501.h"



static int cam_fd_hw_dev_probe(struct platform_device *pdev)

{
@@ -193,6 +194,10 @@ static const struct of_device_id cam_fd_hw_dt_match[] = { 
		.compatible = "qcom,fd41",

		.data = &cam_fd_wrapper120_core410_info,

	},

	{

		.compatible = "qcom,fd501",

		.data = &cam_fd_wrapper200_core501_info,

	},

	{}

};

MODULE_DEVICE_TABLE(of, cam_fd_hw_dt_match);