Merge "msm: camera: Add clk support for ois and eeprom" into dev/msm-4.9-camx (0e4df7ed) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c

+20 −1

Original line number	Diff line number	Diff line
		@@ -231,9 +231,11 @@ static int cam_eeprom_i2c_driver_probe(struct i2c_client *client,

		static int cam_eeprom_i2c_driver_remove(struct i2c_client *client)
		{
		int i;
		struct v4l2_subdev *sd = i2c_get_clientdata(client);
		struct cam_eeprom_ctrl_t *e_ctrl;
		struct cam_eeprom_soc_private *soc_private;
		struct cam_hw_soc_info *soc_info;

		if (!sd) {
		CAM_ERR(CAM_EEPROM, "Subdevice is NULL");
		@@ -253,6 +255,10 @@ static int cam_eeprom_i2c_driver_remove(struct i2c_client *client)
		return -EINVAL;
		}

		soc_info = &e_ctrl->soc_info;
		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		if (soc_private)
		kfree(soc_private);

		@@ -358,9 +364,11 @@ static int cam_eeprom_spi_driver_probe(struct spi_device *spi)

		static int cam_eeprom_spi_driver_remove(struct spi_device *sdev)
		{
		int i;
		struct v4l2_subdev *sd = spi_get_drvdata(sdev);
		struct cam_eeprom_ctrl_t *e_ctrl;
		struct cam_eeprom_soc_private *soc_private;
		struct cam_hw_soc_info *soc_info;

		if (!sd) {
		CAM_ERR(CAM_EEPROM, "Subdevice is NULL");
		@@ -373,6 +381,10 @@ static int cam_eeprom_spi_driver_remove(struct spi_device *sdev)
		return -EINVAL;
		}

		soc_info = &e_ctrl->soc_info;
		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		kfree(e_ctrl->io_master_info.spi_client);
		soc_private =
		(struct cam_eeprom_soc_private *)e_ctrl->soc_info.soc_private;
		@@ -458,7 +470,9 @@ static int32_t cam_eeprom_platform_driver_probe(

		static int cam_eeprom_platform_driver_remove(struct platform_device *pdev)
		{
		int i;
		struct cam_eeprom_ctrl_t *e_ctrl;
		struct cam_hw_soc_info *soc_info;

		e_ctrl = platform_get_drvdata(pdev);
		if (!e_ctrl) {
		@@ -466,7 +480,12 @@ static int cam_eeprom_platform_driver_remove(struct platform_device *pdev)
		return -EINVAL;
		}

		kfree(e_ctrl->soc_info.soc_private);
		soc_info = &e_ctrl->soc_info;

		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		kfree(soc_info->soc_private);
		kfree(e_ctrl->io_master_info.cci_client);
		kfree(e_ctrl);
		return 0;

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_soc.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ static int cam_eeprom_cmm_dts(struct cam_eeprom_soc_private *eb_info,
		*/
		int cam_eeprom_parse_dt(struct cam_eeprom_ctrl_t *e_ctrl)
		{
		int rc = 0;
		int i, rc = 0;
		struct cam_hw_soc_info *soc_info = &e_ctrl->soc_info;
		struct device_node *of_node = NULL;
		struct cam_eeprom_soc_private *soc_private =
		@@ -358,5 +358,16 @@ int cam_eeprom_parse_dt(struct cam_eeprom_ctrl_t *e_ctrl)
		soc_private->i2c_info.slave_addr);
		}

		for (i = 0; i < soc_info->num_clk; i++) {
		soc_info->clk[i] = devm_clk_get(soc_info->dev,
		soc_info->clk_name[i]);
		if (!soc_info->clk[i]) {
		CAM_ERR(CAM_SENSOR, "get failed for %s",
		soc_info->clk_name[i]);
		rc = -ENOENT;
		return rc;
		}
		}

		return rc;
		}

drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_dev.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,9 @@ static int cam_ois_i2c_driver_probe(struct i2c_client *client,

		static int cam_ois_i2c_driver_remove(struct i2c_client *client)
		{
		int i;
		struct cam_ois_ctrl_t *o_ctrl = i2c_get_clientdata(client);
		struct cam_hw_soc_info *soc_info;
		struct cam_ois_soc_private *soc_private;
		struct cam_sensor_power_ctrl_t *power_info;

		@@ -235,8 +237,13 @@ static int cam_ois_i2c_driver_remove(struct i2c_client *client)
		return -EINVAL;
		}

		soc_info = &o_ctrl->soc_info;

		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		soc_private =
		(struct cam_ois_soc_private *)o_ctrl->soc_info.soc_private;
		(struct cam_ois_soc_private *)soc_info->soc_private;
		power_info = &soc_private->power_info;

		kfree(power_info->power_setting);
		@@ -327,9 +334,11 @@ static int32_t cam_ois_platform_driver_probe(

		static int cam_ois_platform_driver_remove(struct platform_device *pdev)
		{
		int i;
		struct cam_ois_ctrl_t *o_ctrl;
		struct cam_ois_soc_private *soc_private;
		struct cam_sensor_power_ctrl_t *power_info;
		struct cam_hw_soc_info *soc_info;

		o_ctrl = platform_get_drvdata(pdev);
		if (!o_ctrl) {
		@@ -337,6 +346,10 @@ static int cam_ois_platform_driver_remove(struct platform_device *pdev)
		return -EINVAL;
		}

		soc_info = &o_ctrl->soc_info;
		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		soc_private =
		(struct cam_ois_soc_private *)o_ctrl->soc_info.soc_private;
		power_info = &soc_private->power_info;

drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_soc.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		*/
		static int cam_ois_get_dt_data(struct cam_ois_ctrl_t *o_ctrl)
		{
		int rc = 0;
		int i, rc = 0;
		struct cam_hw_soc_info *soc_info = &o_ctrl->soc_info;
		struct cam_ois_soc_private *soc_private =
		(struct cam_ois_soc_private *)o_ctrl->soc_info.soc_private;
		@@ -65,6 +65,17 @@ static int cam_ois_get_dt_data(struct cam_ois_ctrl_t *o_ctrl)
		return -EINVAL;
		}

		for (i = 0; i < soc_info->num_clk; i++) {
		soc_info->clk[i] = devm_clk_get(soc_info->dev,
		soc_info->clk_name[i]);
		if (!soc_info->clk[i]) {
		CAM_ERR(CAM_SENSOR, "get failed for %s",
		soc_info->clk_name[i]);
		rc = -ENOENT;
		return rc;
		}
		}

		return rc;
		}
		/**

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_dev.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -208,7 +208,9 @@ static int32_t cam_sensor_driver_i2c_probe(struct i2c_client *client,

		static int cam_sensor_platform_remove(struct platform_device *pdev)
		{
		int i;
		struct cam_sensor_ctrl_t *s_ctrl;
		struct cam_hw_soc_info *soc_info;

		s_ctrl = platform_get_drvdata(pdev);
		if (!s_ctrl) {
		@@ -216,6 +218,10 @@ static int cam_sensor_platform_remove(struct platform_device *pdev)
		return 0;
		}

		soc_info = &s_ctrl->soc_info;
		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		kfree(s_ctrl->i2c_data.per_frame);
		devm_kfree(&pdev->dev, s_ctrl);

		@@ -224,13 +230,19 @@ static int cam_sensor_platform_remove(struct platform_device *pdev)

		static int cam_sensor_driver_i2c_remove(struct i2c_client *client)
		{
		int i;
		struct cam_sensor_ctrl_t *s_ctrl = i2c_get_clientdata(client);
		struct cam_hw_soc_info *soc_info;

		if (!s_ctrl) {
		CAM_ERR(CAM_SENSOR, "sensor device is NULL");
		return 0;
		}

		soc_info = &s_ctrl->soc_info;
		for (i = 0; i < soc_info->num_clk; i++)
		devm_clk_put(soc_info->dev, soc_info->clk[i]);

		kfree(s_ctrl->i2c_data.per_frame);
		kfree(s_ctrl);