Merge "msm: camera: kernel driver for sensor imx132" (d75269e1) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/clock-8974.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -4818,10 +4818,12 @@ static struct clk_lookup msm_clocks_8974pro_only[] __initdata = {
		CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "20.qcom,camera"),
		CLK_LOOKUP("cam_src_clk", mclk2_clk_src.c, "6c.qcom,camera"),
		CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "90.qcom,camera"),
		CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "6d.qcom,camera"),
		CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "6e.qcom,camera"),
		CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "20.qcom,camera"),
		CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "6c.qcom,camera"),
		CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "90.qcom,camera"),
		CLK_LOOKUP("cam_clk", camss_mclk1_clk.c, "6d.qcom,camera"),
		};

		static struct clk_lookup msm_clocks_8974_only[] __initdata = {

drivers/media/platform/msm/camera_v2/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,15 @@ config IMX135
		snapshot config = 4208 x 3120 at 24 fps,
		Video HDR support.

		config IMX132
		bool "Sensor IMX132 (BAYER 2M)"
		depends on MSMB_CAMERA
		---help---
		Sony 2 MP Bayer Sensor with auto focus, uses
		2 mipi lanes, preview config = 1920 x 1080 at 30 fps,
		snapshot config = 1920 x 1080 at 30 fps,
		Video HDR support.

		config OV2720
		bool "Sensor OV2720 (BAYER 2M)"
		depends on MSMB_CAMERA

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/ flash/ eeprom/
		obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor.o
		obj-$(CONFIG_S5K3L1YX) += s5k3l1yx.o
		obj-$(CONFIG_IMX135) += imx135.o
		obj-$(CONFIG_IMX132) += imx132.o
		obj-$(CONFIG_OV8825) += ov8825.o
		obj-$(CONFIG_s5k4e1) += s5k4e1.o
		obj-$(CONFIG_OV12830) += ov12830.o

drivers/media/platform/msm/camera_v2/sensor/imx132.c

0 → 100644

+154 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013, 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 "msm_sensor.h"
		#define IMX132_SENSOR_NAME "imx132"
		DEFINE_MSM_MUTEX(imx132_mut);

		static struct msm_sensor_ctrl_t imx132_s_ctrl;

		static struct msm_sensor_power_setting imx132_power_setting[] = {
		{
		.seq_type = SENSOR_VREG,
		.seq_val = CAM_VANA,
		.config_val = 0,
		.delay = 0,
		},
		{
		.seq_type = SENSOR_VREG,
		.seq_val = CAM_VDIG,
		.config_val = 0,
		.delay = 0,
		},
		{
		.seq_type = SENSOR_VREG,
		.seq_val = CAM_VIO,
		.config_val = 0,
		.delay = 0,
		},
		{
		.seq_type = SENSOR_GPIO,
		.seq_val = SENSOR_GPIO_RESET,
		.config_val = GPIO_OUT_LOW,
		.delay = 1,
		},
		{
		.seq_type = SENSOR_GPIO,
		.seq_val = SENSOR_GPIO_RESET,
		.config_val = GPIO_OUT_HIGH,
		.delay = 5,
		},
		{
		.seq_type = SENSOR_CLK,
		.seq_val = SENSOR_CAM_MCLK,
		.config_val = 0,
		.delay = 1,
		},
		{
		.seq_type = SENSOR_I2C_MUX,
		.seq_val = 0,
		.config_val = 0,
		.delay = 0,
		},
		};

		static struct v4l2_subdev_info imx132_subdev_info[] = {
		{
		.code = V4L2_MBUS_FMT_SRGGB10_1X10,
		.colorspace = V4L2_COLORSPACE_JPEG,
		.fmt = 1,
		.order = 0,
		},
		};

		static const struct i2c_device_id imx132_i2c_id[] = {
		{IMX132_SENSOR_NAME, (kernel_ulong_t)&imx132_s_ctrl},
		{ }
		};

		static int32_t msm_imx132_i2c_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		{
		return msm_sensor_i2c_probe(client, id, &imx132_s_ctrl);
		}
		static struct i2c_driver imx132_i2c_driver = {
		.id_table = imx132_i2c_id,
		.probe = msm_imx132_i2c_probe,
		.driver = {
		.name = IMX132_SENSOR_NAME,
		},
		};

		static struct msm_camera_i2c_client imx132_sensor_i2c_client = {
		.addr_type = MSM_CAMERA_I2C_WORD_ADDR,
		};

		static const struct of_device_id imx132_dt_match[] = {
		{.compatible = "qcom,imx132", .data = &imx132_s_ctrl},
		{}
		};

		MODULE_DEVICE_TABLE(of, imx132_dt_match);

		static struct platform_driver imx132_platform_driver = {
		.driver = {
		.name = "qcom,imx132",
		.owner = THIS_MODULE,
		.of_match_table = imx132_dt_match,
		},
		};

		static int32_t imx132_platform_probe(struct platform_device *pdev)
		{
		int32_t rc = 0;
		const struct of_device_id *match;
		match = of_match_device(imx132_dt_match, &pdev->dev);
		rc = msm_sensor_platform_probe(pdev, match->data);
		return rc;
		}

		static int __init imx132_init_module(void)
		{
		int32_t rc = 0;
		pr_info("%s:%d\n", __func__, __LINE__);
		rc = platform_driver_probe(&imx132_platform_driver,
		imx132_platform_probe);
		if (!rc)
		return rc;
		pr_err("%s:%d rc %d\n", __func__, __LINE__, rc);
		return i2c_add_driver(&imx132_i2c_driver);
		}

		static void __exit imx132_exit_module(void)
		{
		pr_info("%s:%d\n", __func__, __LINE__);
		if (imx132_s_ctrl.pdev) {
		msm_sensor_free_sensor_data(&imx132_s_ctrl);
		platform_driver_unregister(&imx132_platform_driver);
		} else
		i2c_del_driver(&imx132_i2c_driver);
		return;
		}

		static struct msm_sensor_ctrl_t imx132_s_ctrl = {
		.sensor_i2c_client = &imx132_sensor_i2c_client,
		.power_setting_array.power_setting = imx132_power_setting,
		.power_setting_array.size = ARRAY_SIZE(imx132_power_setting),
		.msm_sensor_mutex = &imx132_mut,
		.sensor_v4l2_subdev_info = imx132_subdev_info,
		.sensor_v4l2_subdev_info_size = ARRAY_SIZE(imx132_subdev_info),
		};

		module_init(imx132_init_module);
		module_exit(imx132_exit_module);
		MODULE_DESCRIPTION("imx132");
		MODULE_LICENSE("GPL v2");