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

Commit 957c188a 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: Add support to set i2c freq mode"

parents 0898226b c8ccda0d

Documentation/devicetree/bindings/media/video/msm-eeprom.txt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ Optional properties: 
    data, data type, delay in ms. size 0 stand for not used.

- cam_vdig-supply : should contain regulator to be used for the digital vdd.

- qcom,saddr%d : property should specify the slave address for block (%d).

- qcom,i2c-freq-mode : property should specify the I2C speed mode.



Optional properties -EEPROM Camera Multimodule

- qcom,cmm-data-support - Camera MultiModule data capability flag.

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

+9 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,14 @@ static int msm_eeprom_platform_probe(struct platform_device *pdev) 
	power_info->clk_info_size = ARRAY_SIZE(cam_8974_clk_info);

	power_info->dev = &pdev->dev;





	rc = of_property_read_u32(of_node, "qcom,i2c-freq-mode",

		&eb_info->i2c_freq_mode);

	if (rc < 0 || (eb_info->i2c_freq_mode >= I2C_MAX_MODES)) {

		eb_info->i2c_freq_mode = I2C_STANDARD_MODE;

		CDBG("%s Default I2C standard speed mode.\n", __func__);

	}



	CDBG("qcom,slave-addr = 0x%X\n", eb_info->i2c_slaveaddr);

	cci_client = e_ctrl->i2c_client.cci_client;

	cci_client->cci_subdev = msm_cci_get_subdev();
@@ -1097,6 +1105,7 @@ static int msm_eeprom_platform_probe(struct platform_device *pdev) 
	cci_client->sid = eb_info->i2c_slaveaddr >> 1;

	cci_client->retries = 3;

	cci_client->id_map = 0;

	cci_client->i2c_freq_mode = eb_info->i2c_freq_mode;



	rc = of_property_read_string(of_node, "qcom,eeprom-name",

		&eb_info->eeprom_name);

include/soc/qcom/camera2.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct msm_eeprom_board_info { 
	uint16_t i2c_slaveaddr;

	struct msm_camera_power_ctrl_t power_info;

	struct msm_eeprom_cmm_t cmm_data;

	enum i2c_freq_mode_t i2c_freq_mode;

};



#endif