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

Commit a6d80a72 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Remove true/false redefinitions" into camera-kernel.lnx.3.1

parents 08bdd0fb 2fb55447

drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.h

+0 −4
Original line number Diff line number Diff line
@@ -30,16 +30,12 @@ 
#define NUM_MASTERS 2

#define NUM_QUEUES 2



#define TRUE  1

#define FALSE 0



#define ACTUATOR_DRIVER_I2C "i2c_actuator"

#define CAMX_ACTUATOR_DEV_NAME "cam-actuator-driver"



#define MSM_ACTUATOR_MAX_VREGS (10)

#define ACTUATOR_MAX_POLL_COUNT 10





enum cam_actuator_apply_state_t {

	ACT_APPLY_SETTINGS_NOW,

	ACT_APPLY_SETTINGS_LATER,

drivers/cam_sensor_module/cam_cci/cam_cci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ static void cam_cci_flush_queue(struct cci_device *cci_dev, 
	} else if (rc == 0) {

		CAM_ERR(CAM_CCI, "wait timeout");



		/* Set reset pending flag to TRUE */

		cci_dev->cci_master_info[master].reset_pending = TRUE;

		/* Set reset pending flag to true */

		cci_dev->cci_master_info[master].reset_pending = true;



		/* Set proper mask to RESET CMD address based on MASTER */

		if (master == MASTER_0)

drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

+7 −7
Original line number Diff line number Diff line
@@ -69,18 +69,18 @@ irqreturn_t cam_cci_irq(int irq_num, void *data) 


	if (irq_status0 & CCI_IRQ_STATUS_0_RST_DONE_ACK_BMSK) {

		struct cam_cci_master_info *cci_master_info;

		if (cci_dev->cci_master_info[MASTER_0].reset_pending == TRUE) {

		if (cci_dev->cci_master_info[MASTER_0].reset_pending == true) {

			cci_master_info = &cci_dev->cci_master_info[MASTER_0];

			cci_dev->cci_master_info[MASTER_0].reset_pending =

				FALSE;

				false;

			if (!cci_master_info->status)

				complete(&cci_master_info->reset_complete);

			cci_master_info->status = 0;

		}

		if (cci_dev->cci_master_info[MASTER_1].reset_pending == TRUE) {

		if (cci_dev->cci_master_info[MASTER_1].reset_pending == true) {

			cci_master_info = &cci_dev->cci_master_info[MASTER_1];

			cci_dev->cci_master_info[MASTER_1].reset_pending =

				FALSE;

				false;

			if (!cci_master_info->status)

				complete(&cci_master_info->reset_complete);

			cci_master_info->status = 0;
@@ -205,12 +205,12 @@ irqreturn_t cam_cci_irq(int irq_num, void *data) 
		CAM_DBG(CAM_CCI, "RD_PAUSE ON MASTER_1");



	if (irq_status0 & CCI_IRQ_STATUS_0_I2C_M0_Q0Q1_HALT_ACK_BMSK) {

		cci_dev->cci_master_info[MASTER_0].reset_pending = TRUE;

		cci_dev->cci_master_info[MASTER_0].reset_pending = true;

		cam_io_w_mb(CCI_M0_RESET_RMSK,

			base + CCI_RESET_CMD_ADDR);

	}

	if (irq_status0 & CCI_IRQ_STATUS_0_I2C_M1_Q0Q1_HALT_ACK_BMSK) {

		cci_dev->cci_master_info[MASTER_1].reset_pending = TRUE;

		cci_dev->cci_master_info[MASTER_1].reset_pending = true;

		cam_io_w_mb(CCI_M1_RESET_RMSK,

			base + CCI_RESET_CMD_ADDR);

	}
@@ -316,7 +316,7 @@ static int cam_cci_irq_routine(struct v4l2_subdev *sd, u32 status, 
		&cci_dev->soc_info;



	ret = cam_cci_irq(soc_info->irq_line->start, cci_dev);

	*handled = TRUE;

	*handled = true;

	return 0;

}

drivers/cam_sensor_module/cam_cci/cam_cci_dev.h

+0 −3
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ 
#define NUM_MASTERS 2

#define NUM_QUEUES 2



#define TRUE  1

#define FALSE 0



#define CCI_PINCTRL_STATE_DEFAULT "cci_default"

#define CCI_PINCTRL_STATE_SLEEP "cci_suspend"

drivers/cam_sensor_module/cam_cci/cam_cci_soc.c

+3 −3
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ int cam_cci_init(struct v4l2_subdev *sd, 
			for (i = 0; i < NUM_QUEUES; i++)

				reinit_completion(

				&cci_dev->cci_master_info[master].report_q[i]);

			/* Set reset pending flag to TRUE */

			cci_dev->cci_master_info[master].reset_pending = TRUE;

			/* Set reset pending flag to true */

			cci_dev->cci_master_info[master].reset_pending = true;

			/* Set proper mask to RESET CMD address */

			if (master == MASTER_0)

				cam_io_w_mb(CCI_M0_RESET_RMSK,
@@ -140,7 +140,7 @@ int cam_cci_init(struct v4l2_subdev *sd, 
		}

	}



	cci_dev->cci_master_info[master].reset_pending = TRUE;

	cci_dev->cci_master_info[master].reset_pending = true;

	cam_io_w_mb(CCI_RESET_CMD_RMSK, base +

			CCI_RESET_CMD_ADDR);

	cam_io_w_mb(0x1, base + CCI_RESET_CMD_ADDR);