Merge "msm: camera: Add gpio based flash driver support" into kernel.lnx.4.9.r12-rel (a02c44a3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v2/sensor/flash/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/common
		ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
		obj-$(CONFIG_MSMB_CAMERA) += msm_flash.o
		obj-$(CONFIG_MSMB_CAMERA) += qm215_gpio_flash.o

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

+13 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2009-2019, 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
		@@ -17,6 +17,7 @@
		#include <linux/of_gpio.h>
		#include <linux/leds-qpnp-flash.h>
		#include "msm_flash.h"
		#include "msm_camera_io_util.h"
		#include "msm_camera_dt_util.h"
		#include "msm_cci.h"

		@@ -514,6 +515,8 @@ static int32_t msm_flash_init(
		__func__, __LINE__,
		flash_data->cfg.flash_init_info->flash_driver_type);
		}
		if (flash_ctrl->platform_flash_init)
		flash_ctrl->platform_flash_init(flash_ctrl, flash_data);

		if (flash_ctrl->func_tbl->camera_flash_init) {
		rc = flash_ctrl->func_tbl->camera_flash_init(
		@@ -600,6 +603,8 @@ static int32_t msm_flash_prepare(
		__func__, __LINE__, flash_ctrl->flash_state);

		if (flash_ctrl->switch_trigger == NULL) {
		if (flash_ctrl->platform_flash_init)
		return ret;
		pr_err("%s:%d Invalid argument\n",
		__func__, __LINE__);
		return -EINVAL;
		@@ -1286,6 +1291,8 @@ static int32_t msm_flash_platform_probe(struct platform_device *pdev)
		kfree(flash_ctrl);
		return -EINVAL;
		}
		if (flash_ctrl->flash_driver_type == FLASH_DRIVER_GPIO)
		platform_set_drvdata(pdev, flash_ctrl);

		flash_ctrl->flash_state = MSM_CAMERA_FLASH_RELEASE;
		flash_ctrl->power_info.dev = &flash_ctrl->pdev->dev;
		@@ -1334,6 +1341,11 @@ static int32_t msm_flash_platform_probe(struct platform_device *pdev)
		return rc;
		}

		int32_t camera_flash_platform_probe(struct platform_device *pdev)
		{
		return msm_flash_platform_probe(pdev);
		}

		MODULE_DEVICE_TABLE(of, msm_flash_dt_match);

		static struct platform_driver msm_flash_platform_driver = {

drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.h

+5 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2009-2016, 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2009-2016,2018-2019, 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
		@@ -102,6 +102,8 @@ struct msm_flash_ctrl_t {

		/* flash state */
		enum msm_camera_flash_state_t flash_state;
		int32_t (platform_flash_init)(struct msm_flash_ctrl_t flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data);
		};

		int msm_flash_i2c_probe(struct i2c_client *client,
		@@ -124,4 +126,6 @@ int msm_flash_led_release(struct msm_flash_ctrl_t *fctrl);
		int msm_flash_led_off(struct msm_flash_ctrl_t *fctrl);
		int msm_flash_led_low(struct msm_flash_ctrl_t *fctrl);
		int msm_flash_led_high(struct msm_flash_ctrl_t *fctrl);
		int32_t camera_flash_platform_probe(struct platform_device *pdev);

		#endif

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

0 → 100644

+264 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018-2019, 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		*/

		#include <linux/module.h>
		#include <linux/export.h>
		#include "msm_camera_io_util.h"
		#include "msm_flash.h"

		#define FLASH_NAME "qcom,gpio-flash"

		#undef CDBG
		#define CDBG(fmt, args...) pr_debug(fmt, ##args)

		static const struct of_device_id msm_gpio_flash_dt_match[] = {
		{.compatible = "qcom,qm215-gpio-flash", .data = NULL},
		{}
		};
		static struct msm_flash_table qm215_gpio_flash_table;
		MODULE_DEVICE_TABLE(of, msm_flash_dt_match);

		static int32_t qm215_flash_low(
		struct msm_flash_ctrl_t *flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data)
		{
		struct msm_camera_power_ctrl_t *power_info = NULL;
		struct msm_camera_gpio_num_info *gpio_num_info = NULL;

		if (!flash_ctrl) {
		pr_err("device data NULL\n");
		return -EINVAL;
		}

		CDBG("Enter");
		power_info = &flash_ctrl->power_info;
		gpio_num_info = power_info->gpio_conf->gpio_num_info;

		if (flash_ctrl->flash_driver_type == FLASH_DRIVER_GPIO &&
		gpio_num_info->valid[SENSOR_GPIO_FL_NOW] &&
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN]) {

		CDBG("flash op low gpio num %d(state:%d) %d(state: %d)\n",
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_HIGH,
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_HIGH);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_HIGH);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_HIGH);
		}
		CDBG("Exit\n");
		return 0;
		}

		static int32_t qm215_flash_high(
		struct msm_flash_ctrl_t *flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data)
		{
		struct msm_camera_power_ctrl_t *power_info = NULL;
		struct msm_camera_gpio_num_info *gpio_num_info = NULL;

		if (!flash_ctrl) {
		pr_err("device data NULL\n");
		return -EINVAL;
		}

		CDBG("Enter\n");
		power_info = &flash_ctrl->power_info;
		gpio_num_info = power_info->gpio_conf->gpio_num_info;

		if (flash_ctrl->flash_driver_type == FLASH_DRIVER_GPIO &&
		gpio_num_info->valid[SENSOR_GPIO_FL_NOW] &&
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN]) {

		CDBG("flash op high gpio num %d(state:%d) %d(state:%d)\n",
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_LOW,
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_HIGH);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_LOW);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_HIGH);
		}
		CDBG("Exit\n");

		return 0;
		}

		static int32_t qm215_flash_release(
		struct msm_flash_ctrl_t *flash_ctrl)
		{
		int32_t rc = 0;

		if (!flash_ctrl) {
		pr_err("device data NULL\n");
		return -EINVAL;
		}

		CDBG("Enter\n");
		rc = flash_ctrl->func_tbl->camera_flash_off(flash_ctrl, NULL);
		if (rc < 0) {
		pr_err("%s:%d camera_flash_init failed rc = %d",
		__func__, __LINE__, rc);
		return rc;
		}
		flash_ctrl->flash_state = MSM_CAMERA_FLASH_RELEASE;
		CDBG("Exit\n");
		return 0;
		}

		static int32_t qm215_flash_off(struct msm_flash_ctrl_t *flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data)
		{
		struct msm_camera_power_ctrl_t *power_info = NULL;
		struct msm_camera_gpio_num_info *gpio_num_info = NULL;

		if (!flash_ctrl) {
		pr_err("device data NULL\n");
		return -EINVAL;
		}

		CDBG("Enter\n");
		power_info = &flash_ctrl->power_info;
		gpio_num_info = power_info->gpio_conf->gpio_num_info;

		if (flash_ctrl->flash_driver_type == FLASH_DRIVER_GPIO &&
		gpio_num_info->valid[SENSOR_GPIO_FL_NOW] &&
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN]) {

		CDBG("flash off gpio num %d(state:%d) %d(state: %d)\n",
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_LOW,
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_LOW);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_NOW],
		GPIO_OUT_LOW);
		gpio_set_value_cansleep(
		gpio_num_info->gpio_num[SENSOR_GPIO_FL_EN],
		GPIO_OUT_LOW);
		}

		CDBG("Exit\n");
		return 0;
		}

		static int32_t qm215_flash_gpio_init(
		struct msm_flash_ctrl_t *flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data)
		{
		int32_t rc = 0;

		CDBG("Enter");
		rc = flash_ctrl->func_tbl->camera_flash_off(flash_ctrl, flash_data);

		CDBG("Exit");
		return rc;
		}


		static int32_t qm215_platform_flash_init(struct msm_flash_ctrl_t *flash_ctrl,
		struct msm_flash_cfg_data_t *flash_data)
		{
		if (!flash_ctrl) {
		pr_err("devices data NULL\n");
		return -EINVAL;
		}

		if (flash_ctrl->flash_driver_type == FLASH_DRIVER_GPIO)
		flash_ctrl->func_tbl = &qm215_gpio_flash_table.func_tbl;

		return 0;
		}
		static int32_t qm215_flash_platform_probe(struct platform_device *pdev)
		{
		int32_t rc = 0;
		struct msm_flash_ctrl_t *flash_ctrl = NULL;
		struct msm_camera_power_ctrl_t *power_info = NULL;
		struct msm_camera_gpio_conf *gpio_conf = NULL;

		if (!pdev->dev.of_node) {
		pr_err("of_node NULL\n");
		return -EINVAL;
		}
		CDBG("enter probe\n");
		rc = camera_flash_platform_probe(pdev);
		if (rc >= 0) {
		flash_ctrl =
		(struct msm_flash_ctrl_t *) platform_get_drvdata(pdev);
		CDBG("device data %pK\n", flash_ctrl);
		if (!flash_ctrl) {
		pr_err("of_node NULL\n");
		return -EINVAL;
		}
		power_info = &flash_ctrl->power_info;
		gpio_conf = power_info->gpio_conf;
		rc = msm_camera_request_gpio_table(gpio_conf->cam_gpio_req_tbl,
		gpio_conf->cam_gpio_req_tbl_size, 1);
		if (rc < 0) {
		pr_err("%s: request gpio failed\n", __func__);
		return rc;
		}
		flash_ctrl->platform_flash_init = qm215_platform_flash_init;
		}
		return rc;
		}

		static struct platform_driver msm_gpio_flash_platform_driver = {
		.probe = qm215_flash_platform_probe,
		.driver = {
		.name = "qcom,camera-gpio-flash",
		.owner = THIS_MODULE,
		.of_match_table = msm_gpio_flash_dt_match,
		},
		};

		static int __init qm215_gpio_flash_init_module(void)
		{
		int32_t rc = 0;

		CDBG("Enter\n");
		rc = platform_driver_register(&msm_gpio_flash_platform_driver);
		if (rc)
		pr_err("platform probe for flash failed");

		return rc;
		}

		static void __exit qm215_gpio_flash_exit_module(void)
		{
		platform_driver_unregister(&msm_gpio_flash_platform_driver);
		}

		static struct msm_flash_table qm215_gpio_flash_table = {
		.flash_driver_type = FLASH_DRIVER_GPIO,
		.func_tbl = {
		.camera_flash_init = qm215_flash_gpio_init,
		.camera_flash_release = qm215_flash_release,
		.camera_flash_off = qm215_flash_off,
		.camera_flash_low = qm215_flash_low,
		.camera_flash_high = qm215_flash_high,
		.camera_flash_query_current = NULL,
		},
		};

		module_init(qm215_gpio_flash_init_module);
		module_exit(qm215_gpio_flash_exit_module);
		MODULE_DESCRIPTION("MSM GPIO FLASH");
		MODULE_LICENSE("GPL v2");