Merge "msm: camera: Enable LED Flash support on 8909" (2db3b15e) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/camera_v2/sensor/flash/adp1660.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -118,11 +118,20 @@ static struct platform_driver adp1660_platform_driver = {
		static int __init msm_flash_adp1660_init_module(void)
		{
		int32_t rc = 0;

		rc = platform_driver_register(&adp1660_platform_driver);
		if (fctrl.pdev != NULL && rc == 0) {
		pr_err("adp1660 platform_driver_register success");
		return rc;
		} else if (rc != 0) {
		pr_err("adp1660 platform_driver_register failed");
		return rc;
		} else {
		rc = i2c_add_driver(&adp1660_i2c_driver);
		if (!rc)
		pr_err("adp1660 i2c_add_driver success");
		}
		return rc;
		pr_debug("%s:%d rc %d\n", __func__, __LINE__, rc);
		return i2c_add_driver(&adp1660_i2c_driver);
		}

		static void __exit msm_flash_adp1660_exit_module(void)

+3 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ int32_t msm_led_i2c_flash_create_v4lsubdev(void *data)
		fctrl->msm_sd.sd.entity.group_id = MSM_CAMERA_SUBDEV_LED_FLASH;
		msm_sd_register(&fctrl->msm_sd);

		msm_led_flash_v4l2_subdev_fops = v4l2_subdev_fops;
		fctrl->msm_sd.sd.devnode->fops = &msm_led_flash_v4l2_subdev_fops;

		CDBG("probe success\n");
		return 0;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -119,8 +119,13 @@ static int msm_flash_pinctrl_init(struct msm_led_flash_ctrl_t *ctrl)
		struct msm_pinctrl_info *flash_pctrl = NULL;

		flash_pctrl = &ctrl->pinctrl_info;
		flash_pctrl->pinctrl = devm_pinctrl_get(&ctrl->pdev->dev);

		if (ctrl->pdev != NULL)
		flash_pctrl->pinctrl = devm_pinctrl_get(&ctrl->pdev->dev);
		else
		flash_pctrl->pinctrl = devm_pinctrl_get(&ctrl->
		flash_i2c_client->
		client->dev);
		if (IS_ERR_OR_NULL(flash_pctrl->pinctrl)) {
		pr_err("%s:%d Getting pinctrl handle failed\n",
		__func__, __LINE__);