2019-09-30 06:06:44 -07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2015-03-20 14:03:52 -07:00
|
|
|
/*
|
|
|
|
* Omnivision OV2659 CMOS Image Sensor driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2015 Texas Instruments, Inc.
|
|
|
|
*
|
|
|
|
* Benoit Parrot <bparrot@ti.com>
|
|
|
|
* Lad, Prabhakar <prabhakar.csengg@gmail.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
#include <linux/delay.h>
|
2019-09-30 06:06:42 -07:00
|
|
|
#include <linux/gpio/consumer.h>
|
2015-03-20 14:03:52 -07:00
|
|
|
#include <linux/i2c.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/of_graph.h>
|
2019-09-30 06:06:42 -07:00
|
|
|
#include <linux/pm_runtime.h>
|
2015-03-20 14:03:52 -07:00
|
|
|
|
2015-11-10 07:01:44 -07:00
|
|
|
#include <media/i2c/ov2659.h>
|
2015-03-20 14:03:52 -07:00
|
|
|
#include <media/v4l2-ctrls.h>
|
|
|
|
#include <media/v4l2-event.h>
|
2016-08-26 16:17:25 -07:00
|
|
|
#include <media/v4l2-fwnode.h>
|
2015-03-20 14:03:52 -07:00
|
|
|
#include <media/v4l2-image-sizes.h>
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
|
|
|
|
#define DRIVER_NAME "ov2659"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OV2659 register definitions
|
|
|
|
*/
|
|
|
|
#define REG_SOFTWARE_STANDBY 0x0100
|
|
|
|
#define REG_SOFTWARE_RESET 0x0103
|
|
|
|
#define REG_IO_CTRL00 0x3000
|
|
|
|
#define REG_IO_CTRL01 0x3001
|
|
|
|
#define REG_IO_CTRL02 0x3002
|
|
|
|
#define REG_OUTPUT_VALUE00 0x3008
|
|
|
|
#define REG_OUTPUT_VALUE01 0x3009
|
|
|
|
#define REG_OUTPUT_VALUE02 0x300d
|
|
|
|
#define REG_OUTPUT_SELECT00 0x300e
|
|
|
|
#define REG_OUTPUT_SELECT01 0x300f
|
|
|
|
#define REG_OUTPUT_SELECT02 0x3010
|
|
|
|
#define REG_OUTPUT_DRIVE 0x3011
|
|
|
|
#define REG_INPUT_READOUT00 0x302d
|
|
|
|
#define REG_INPUT_READOUT01 0x302e
|
|
|
|
#define REG_INPUT_READOUT02 0x302f
|
|
|
|
|
|
|
|
#define REG_SC_PLL_CTRL0 0x3003
|
|
|
|
#define REG_SC_PLL_CTRL1 0x3004
|
|
|
|
#define REG_SC_PLL_CTRL2 0x3005
|
|
|
|
#define REG_SC_PLL_CTRL3 0x3006
|
|
|
|
#define REG_SC_CHIP_ID_H 0x300a
|
|
|
|
#define REG_SC_CHIP_ID_L 0x300b
|
|
|
|
#define REG_SC_PWC 0x3014
|
|
|
|
#define REG_SC_CLKRST0 0x301a
|
|
|
|
#define REG_SC_CLKRST1 0x301b
|
|
|
|
#define REG_SC_CLKRST2 0x301c
|
|
|
|
#define REG_SC_CLKRST3 0x301d
|
|
|
|
#define REG_SC_SUB_ID 0x302a
|
|
|
|
#define REG_SC_SCCB_ID 0x302b
|
|
|
|
|
|
|
|
#define REG_GROUP_ADDRESS_00 0x3200
|
|
|
|
#define REG_GROUP_ADDRESS_01 0x3201
|
|
|
|
#define REG_GROUP_ADDRESS_02 0x3202
|
|
|
|
#define REG_GROUP_ADDRESS_03 0x3203
|
|
|
|
#define REG_GROUP_ACCESS 0x3208
|
|
|
|
|
|
|
|
#define REG_AWB_R_GAIN_H 0x3400
|
|
|
|
#define REG_AWB_R_GAIN_L 0x3401
|
|
|
|
#define REG_AWB_G_GAIN_H 0x3402
|
|
|
|
#define REG_AWB_G_GAIN_L 0x3403
|
|
|
|
#define REG_AWB_B_GAIN_H 0x3404
|
|
|
|
#define REG_AWB_B_GAIN_L 0x3405
|
|
|
|
#define REG_AWB_MANUAL_CONTROL 0x3406
|
|
|
|
|
|
|
|
#define REG_TIMING_HS_H 0x3800
|
|
|
|
#define REG_TIMING_HS_L 0x3801
|
|
|
|
#define REG_TIMING_VS_H 0x3802
|
|
|
|
#define REG_TIMING_VS_L 0x3803
|
|
|
|
#define REG_TIMING_HW_H 0x3804
|
|
|
|
#define REG_TIMING_HW_L 0x3805
|
|
|
|
#define REG_TIMING_VH_H 0x3806
|
|
|
|
#define REG_TIMING_VH_L 0x3807
|
|
|
|
#define REG_TIMING_DVPHO_H 0x3808
|
|
|
|
#define REG_TIMING_DVPHO_L 0x3809
|
|
|
|
#define REG_TIMING_DVPVO_H 0x380a
|
|
|
|
#define REG_TIMING_DVPVO_L 0x380b
|
|
|
|
#define REG_TIMING_HTS_H 0x380c
|
|
|
|
#define REG_TIMING_HTS_L 0x380d
|
|
|
|
#define REG_TIMING_VTS_H 0x380e
|
|
|
|
#define REG_TIMING_VTS_L 0x380f
|
|
|
|
#define REG_TIMING_HOFFS_H 0x3810
|
|
|
|
#define REG_TIMING_HOFFS_L 0x3811
|
|
|
|
#define REG_TIMING_VOFFS_H 0x3812
|
|
|
|
#define REG_TIMING_VOFFS_L 0x3813
|
|
|
|
#define REG_TIMING_XINC 0x3814
|
|
|
|
#define REG_TIMING_YINC 0x3815
|
|
|
|
#define REG_TIMING_VERT_FORMAT 0x3820
|
|
|
|
#define REG_TIMING_HORIZ_FORMAT 0x3821
|
|
|
|
|
|
|
|
#define REG_FORMAT_CTRL00 0x4300
|
|
|
|
|
|
|
|
#define REG_VFIFO_READ_START_H 0x4608
|
|
|
|
#define REG_VFIFO_READ_START_L 0x4609
|
|
|
|
|
|
|
|
#define REG_DVP_CTRL02 0x4708
|
|
|
|
|
|
|
|
#define REG_ISP_CTRL00 0x5000
|
|
|
|
#define REG_ISP_CTRL01 0x5001
|
|
|
|
#define REG_ISP_CTRL02 0x5002
|
|
|
|
|
|
|
|
#define REG_LENC_RED_X0_H 0x500c
|
|
|
|
#define REG_LENC_RED_X0_L 0x500d
|
|
|
|
#define REG_LENC_RED_Y0_H 0x500e
|
|
|
|
#define REG_LENC_RED_Y0_L 0x500f
|
|
|
|
#define REG_LENC_RED_A1 0x5010
|
|
|
|
#define REG_LENC_RED_B1 0x5011
|
|
|
|
#define REG_LENC_RED_A2_B2 0x5012
|
|
|
|
#define REG_LENC_GREEN_X0_H 0x5013
|
|
|
|
#define REG_LENC_GREEN_X0_L 0x5014
|
|
|
|
#define REG_LENC_GREEN_Y0_H 0x5015
|
|
|
|
#define REG_LENC_GREEN_Y0_L 0x5016
|
|
|
|
#define REG_LENC_GREEN_A1 0x5017
|
|
|
|
#define REG_LENC_GREEN_B1 0x5018
|
|
|
|
#define REG_LENC_GREEN_A2_B2 0x5019
|
|
|
|
#define REG_LENC_BLUE_X0_H 0x501a
|
|
|
|
#define REG_LENC_BLUE_X0_L 0x501b
|
|
|
|
#define REG_LENC_BLUE_Y0_H 0x501c
|
|
|
|
#define REG_LENC_BLUE_Y0_L 0x501d
|
|
|
|
#define REG_LENC_BLUE_A1 0x501e
|
|
|
|
#define REG_LENC_BLUE_B1 0x501f
|
|
|
|
#define REG_LENC_BLUE_A2_B2 0x5020
|
|
|
|
|
|
|
|
#define REG_AWB_CTRL00 0x5035
|
|
|
|
#define REG_AWB_CTRL01 0x5036
|
|
|
|
#define REG_AWB_CTRL02 0x5037
|
|
|
|
#define REG_AWB_CTRL03 0x5038
|
|
|
|
#define REG_AWB_CTRL04 0x5039
|
|
|
|
#define REG_AWB_LOCAL_LIMIT 0x503a
|
|
|
|
#define REG_AWB_CTRL12 0x5049
|
|
|
|
#define REG_AWB_CTRL13 0x504a
|
|
|
|
#define REG_AWB_CTRL14 0x504b
|
|
|
|
|
|
|
|
#define REG_SHARPENMT_THRESH1 0x5064
|
|
|
|
#define REG_SHARPENMT_THRESH2 0x5065
|
|
|
|
#define REG_SHARPENMT_OFFSET1 0x5066
|
|
|
|
#define REG_SHARPENMT_OFFSET2 0x5067
|
|
|
|
#define REG_DENOISE_THRESH1 0x5068
|
|
|
|
#define REG_DENOISE_THRESH2 0x5069
|
|
|
|
#define REG_DENOISE_OFFSET1 0x506a
|
|
|
|
#define REG_DENOISE_OFFSET2 0x506b
|
|
|
|
#define REG_SHARPEN_THRESH1 0x506c
|
|
|
|
#define REG_SHARPEN_THRESH2 0x506d
|
|
|
|
#define REG_CIP_CTRL00 0x506e
|
|
|
|
#define REG_CIP_CTRL01 0x506f
|
|
|
|
|
|
|
|
#define REG_CMX_SIGN 0x5079
|
|
|
|
#define REG_CMX_MISC_CTRL 0x507a
|
|
|
|
|
|
|
|
#define REG_PRE_ISP_CTRL00 0x50a0
|
|
|
|
#define TEST_PATTERN_ENABLE BIT(7)
|
|
|
|
#define VERTICAL_COLOR_BAR_MASK 0x53
|
|
|
|
|
|
|
|
#define REG_NULL 0x0000 /* Array end token */
|
|
|
|
|
|
|
|
#define OV265X_ID(_msb, _lsb) ((_msb) << 8 | (_lsb))
|
|
|
|
#define OV2659_ID 0x2656
|
|
|
|
|
|
|
|
struct sensor_register {
|
|
|
|
u16 addr;
|
|
|
|
u8 value;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ov2659_framesize {
|
|
|
|
u16 width;
|
|
|
|
u16 height;
|
|
|
|
u16 max_exp_lines;
|
|
|
|
const struct sensor_register *regs;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ov2659_pll_ctrl {
|
|
|
|
u8 ctrl1;
|
|
|
|
u8 ctrl2;
|
|
|
|
u8 ctrl3;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ov2659_pixfmt {
|
|
|
|
u32 code;
|
|
|
|
/* Output format Register Value (REG_FORMAT_CTRL00) */
|
|
|
|
struct sensor_register *format_ctrl_regs;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pll_ctrl_reg {
|
|
|
|
unsigned int div;
|
|
|
|
unsigned char reg;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ov2659 {
|
|
|
|
struct v4l2_subdev sd;
|
|
|
|
struct media_pad pad;
|
|
|
|
struct v4l2_mbus_framefmt format;
|
|
|
|
unsigned int xvclk_frequency;
|
|
|
|
const struct ov2659_platform_data *pdata;
|
|
|
|
struct mutex lock;
|
|
|
|
struct i2c_client *client;
|
|
|
|
struct v4l2_ctrl_handler ctrls;
|
|
|
|
struct v4l2_ctrl *link_frequency;
|
2021-05-03 22:09:53 -07:00
|
|
|
struct clk *clk;
|
2015-03-20 14:03:52 -07:00
|
|
|
const struct ov2659_framesize *frame_size;
|
|
|
|
struct sensor_register *format_ctrl_regs;
|
|
|
|
struct ov2659_pll_ctrl pll;
|
|
|
|
int streaming;
|
2019-09-30 06:06:42 -07:00
|
|
|
/* used to control the sensor PWDN pin */
|
|
|
|
struct gpio_desc *pwdn_gpio;
|
|
|
|
/* used to control the sensor RESETB pin */
|
|
|
|
struct gpio_desc *resetb_gpio;
|
2015-03-20 14:03:52 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct sensor_register ov2659_init_regs[] = {
|
|
|
|
{ REG_IO_CTRL00, 0x03 },
|
|
|
|
{ REG_IO_CTRL01, 0xff },
|
|
|
|
{ REG_IO_CTRL02, 0xe0 },
|
|
|
|
{ 0x3633, 0x3d },
|
|
|
|
{ 0x3620, 0x02 },
|
|
|
|
{ 0x3631, 0x11 },
|
|
|
|
{ 0x3612, 0x04 },
|
|
|
|
{ 0x3630, 0x20 },
|
|
|
|
{ 0x4702, 0x02 },
|
|
|
|
{ 0x370c, 0x34 },
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x03 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x20 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x02 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0x58 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x05 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x14 },
|
|
|
|
{ REG_TIMING_VTS_H, 0x02 },
|
|
|
|
{ REG_TIMING_VTS_L, 0x68 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x08 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x02 },
|
|
|
|
{ REG_TIMING_XINC, 0x31 },
|
|
|
|
{ REG_TIMING_YINC, 0x31 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ REG_DVP_CTRL02, 0x01 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x81 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x01 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_FORMAT_CTRL00, 0x30 },
|
|
|
|
{ 0x5086, 0x02 },
|
|
|
|
{ REG_ISP_CTRL00, 0xfb },
|
|
|
|
{ REG_ISP_CTRL01, 0x1f },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
|
|
|
{ 0x5025, 0x0e },
|
|
|
|
{ 0x5026, 0x18 },
|
|
|
|
{ 0x5027, 0x34 },
|
|
|
|
{ 0x5028, 0x4c },
|
|
|
|
{ 0x5029, 0x62 },
|
|
|
|
{ 0x502a, 0x74 },
|
|
|
|
{ 0x502b, 0x85 },
|
|
|
|
{ 0x502c, 0x92 },
|
|
|
|
{ 0x502d, 0x9e },
|
|
|
|
{ 0x502e, 0xb2 },
|
|
|
|
{ 0x502f, 0xc0 },
|
|
|
|
{ 0x5030, 0xcc },
|
|
|
|
{ 0x5031, 0xe0 },
|
|
|
|
{ 0x5032, 0xee },
|
|
|
|
{ 0x5033, 0xf6 },
|
|
|
|
{ 0x5034, 0x11 },
|
|
|
|
{ 0x5070, 0x1c },
|
|
|
|
{ 0x5071, 0x5b },
|
|
|
|
{ 0x5072, 0x05 },
|
|
|
|
{ 0x5073, 0x20 },
|
|
|
|
{ 0x5074, 0x94 },
|
|
|
|
{ 0x5075, 0xb4 },
|
|
|
|
{ 0x5076, 0xb4 },
|
|
|
|
{ 0x5077, 0xaf },
|
|
|
|
{ 0x5078, 0x05 },
|
|
|
|
{ REG_CMX_SIGN, 0x98 },
|
|
|
|
{ REG_CMX_MISC_CTRL, 0x21 },
|
|
|
|
{ REG_AWB_CTRL00, 0x6a },
|
|
|
|
{ REG_AWB_CTRL01, 0x11 },
|
|
|
|
{ REG_AWB_CTRL02, 0x92 },
|
|
|
|
{ REG_AWB_CTRL03, 0x21 },
|
|
|
|
{ REG_AWB_CTRL04, 0xe1 },
|
|
|
|
{ REG_AWB_LOCAL_LIMIT, 0x01 },
|
|
|
|
{ 0x503c, 0x05 },
|
|
|
|
{ 0x503d, 0x08 },
|
|
|
|
{ 0x503e, 0x08 },
|
|
|
|
{ 0x503f, 0x64 },
|
|
|
|
{ 0x5040, 0x58 },
|
|
|
|
{ 0x5041, 0x2a },
|
|
|
|
{ 0x5042, 0xc5 },
|
|
|
|
{ 0x5043, 0x2e },
|
|
|
|
{ 0x5044, 0x3a },
|
|
|
|
{ 0x5045, 0x3c },
|
|
|
|
{ 0x5046, 0x44 },
|
|
|
|
{ 0x5047, 0xf8 },
|
|
|
|
{ 0x5048, 0x08 },
|
|
|
|
{ REG_AWB_CTRL12, 0x70 },
|
|
|
|
{ REG_AWB_CTRL13, 0xf0 },
|
|
|
|
{ REG_AWB_CTRL14, 0xf0 },
|
|
|
|
{ REG_LENC_RED_X0_H, 0x03 },
|
|
|
|
{ REG_LENC_RED_X0_L, 0x20 },
|
|
|
|
{ REG_LENC_RED_Y0_H, 0x02 },
|
|
|
|
{ REG_LENC_RED_Y0_L, 0x5c },
|
|
|
|
{ REG_LENC_RED_A1, 0x48 },
|
|
|
|
{ REG_LENC_RED_B1, 0x00 },
|
|
|
|
{ REG_LENC_RED_A2_B2, 0x66 },
|
|
|
|
{ REG_LENC_GREEN_X0_H, 0x03 },
|
|
|
|
{ REG_LENC_GREEN_X0_L, 0x30 },
|
|
|
|
{ REG_LENC_GREEN_Y0_H, 0x02 },
|
|
|
|
{ REG_LENC_GREEN_Y0_L, 0x7c },
|
|
|
|
{ REG_LENC_GREEN_A1, 0x40 },
|
|
|
|
{ REG_LENC_GREEN_B1, 0x00 },
|
|
|
|
{ REG_LENC_GREEN_A2_B2, 0x66 },
|
|
|
|
{ REG_LENC_BLUE_X0_H, 0x03 },
|
|
|
|
{ REG_LENC_BLUE_X0_L, 0x10 },
|
|
|
|
{ REG_LENC_BLUE_Y0_H, 0x02 },
|
|
|
|
{ REG_LENC_BLUE_Y0_L, 0x7c },
|
|
|
|
{ REG_LENC_BLUE_A1, 0x3a },
|
|
|
|
{ REG_LENC_BLUE_B1, 0x00 },
|
|
|
|
{ REG_LENC_BLUE_A2_B2, 0x66 },
|
|
|
|
{ REG_CIP_CTRL00, 0x44 },
|
|
|
|
{ REG_SHARPENMT_THRESH1, 0x08 },
|
|
|
|
{ REG_SHARPENMT_THRESH2, 0x10 },
|
|
|
|
{ REG_SHARPENMT_OFFSET1, 0x12 },
|
|
|
|
{ REG_SHARPENMT_OFFSET2, 0x02 },
|
|
|
|
{ REG_SHARPEN_THRESH1, 0x08 },
|
|
|
|
{ REG_SHARPEN_THRESH2, 0x10 },
|
|
|
|
{ REG_CIP_CTRL01, 0xa6 },
|
|
|
|
{ REG_DENOISE_THRESH1, 0x08 },
|
|
|
|
{ REG_DENOISE_THRESH2, 0x10 },
|
|
|
|
{ REG_DENOISE_OFFSET1, 0x04 },
|
|
|
|
{ REG_DENOISE_OFFSET2, 0x12 },
|
|
|
|
{ 0x507e, 0x40 },
|
|
|
|
{ 0x507f, 0x20 },
|
|
|
|
{ 0x507b, 0x02 },
|
|
|
|
{ REG_CMX_MISC_CTRL, 0x01 },
|
|
|
|
{ 0x5084, 0x0c },
|
|
|
|
{ 0x5085, 0x3e },
|
|
|
|
{ 0x5005, 0x80 },
|
|
|
|
{ 0x3a0f, 0x30 },
|
|
|
|
{ 0x3a10, 0x28 },
|
|
|
|
{ 0x3a1b, 0x32 },
|
|
|
|
{ 0x3a1e, 0x26 },
|
|
|
|
{ 0x3a11, 0x60 },
|
|
|
|
{ 0x3a1f, 0x14 },
|
|
|
|
{ 0x5060, 0x69 },
|
|
|
|
{ 0x5061, 0x7d },
|
|
|
|
{ 0x5062, 0x7d },
|
|
|
|
{ 0x5063, 0x69 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 1280X720 720p */
|
|
|
|
static struct sensor_register ov2659_720p[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0xa0 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0xf0 },
|
|
|
|
{ REG_TIMING_HW_H, 0x05 },
|
|
|
|
{ REG_TIMING_HW_L, 0xbf },
|
|
|
|
{ REG_TIMING_VH_H, 0x03 },
|
|
|
|
{ REG_TIMING_VH_L, 0xcb },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x05 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x00 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x02 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0xd0 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x06 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x4c },
|
|
|
|
{ REG_TIMING_VTS_H, 0x02 },
|
|
|
|
{ REG_TIMING_VTS_L, 0xe8 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x10 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x06 },
|
|
|
|
{ REG_TIMING_XINC, 0x11 },
|
|
|
|
{ REG_TIMING_YINC, 0x11 },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x80 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x00 },
|
2019-09-30 06:06:43 -07:00
|
|
|
{ 0x370a, 0x12 },
|
2015-03-20 14:03:52 -07:00
|
|
|
{ 0x3a03, 0xe8 },
|
|
|
|
{ 0x3a09, 0x6f },
|
|
|
|
{ 0x3a0b, 0x5d },
|
|
|
|
{ 0x3a15, 0x9a },
|
2019-09-30 06:06:43 -07:00
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
2015-03-20 14:03:52 -07:00
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 1600X1200 UXGA */
|
|
|
|
static struct sensor_register ov2659_uxga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xbb },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x06 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x40 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x04 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0xb0 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x07 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x9f },
|
|
|
|
{ REG_TIMING_VTS_H, 0x04 },
|
|
|
|
{ REG_TIMING_VTS_L, 0xd0 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x10 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x06 },
|
|
|
|
{ REG_TIMING_XINC, 0x11 },
|
|
|
|
{ REG_TIMING_YINC, 0x11 },
|
|
|
|
{ 0x3a02, 0x04 },
|
|
|
|
{ 0x3a03, 0xd0 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0xb8 },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x9a },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x04 },
|
|
|
|
{ 0x3a15, 0x50 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x44 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x30 },
|
|
|
|
{ 0x3703, 0x48 },
|
|
|
|
{ 0x3704, 0x48 },
|
|
|
|
{ 0x3705, 0x18 },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x80 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x00 },
|
|
|
|
{ 0x370a, 0x12 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 1280X1024 SXGA */
|
|
|
|
static struct sensor_register ov2659_sxga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x05 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x00 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x04 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0x00 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x07 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x9c },
|
|
|
|
{ REG_TIMING_VTS_H, 0x04 },
|
|
|
|
{ REG_TIMING_VTS_L, 0xd0 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x10 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x06 },
|
|
|
|
{ REG_TIMING_XINC, 0x11 },
|
|
|
|
{ REG_TIMING_YINC, 0x11 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x80 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x00 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 1024X768 SXGA */
|
|
|
|
static struct sensor_register ov2659_xga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x04 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x00 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x03 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0x00 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x07 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x9c },
|
|
|
|
{ REG_TIMING_VTS_H, 0x04 },
|
|
|
|
{ REG_TIMING_VTS_L, 0xd0 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x10 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x06 },
|
|
|
|
{ REG_TIMING_XINC, 0x11 },
|
|
|
|
{ REG_TIMING_YINC, 0x11 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x80 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x00 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 800X600 SVGA */
|
|
|
|
static struct sensor_register ov2659_svga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x03 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x20 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x02 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0x58 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x05 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x14 },
|
|
|
|
{ REG_TIMING_VTS_H, 0x02 },
|
|
|
|
{ REG_TIMING_VTS_L, 0x68 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x08 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x02 },
|
|
|
|
{ REG_TIMING_XINC, 0x31 },
|
|
|
|
{ REG_TIMING_YINC, 0x31 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x81 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x01 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
|
|
|
{ REG_VFIFO_READ_START_L, 0x80 },
|
|
|
|
{ REG_ISP_CTRL02, 0x00 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 640X480 VGA */
|
|
|
|
static struct sensor_register ov2659_vga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x02 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x80 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x01 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0xe0 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x05 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x14 },
|
|
|
|
{ REG_TIMING_VTS_H, 0x02 },
|
|
|
|
{ REG_TIMING_VTS_L, 0x68 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x08 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x02 },
|
|
|
|
{ REG_TIMING_XINC, 0x31 },
|
|
|
|
{ REG_TIMING_YINC, 0x31 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x81 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x01 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
2019-09-30 06:06:37 -07:00
|
|
|
{ REG_VFIFO_READ_START_L, 0xa0 },
|
2015-03-20 14:03:52 -07:00
|
|
|
{ REG_ISP_CTRL02, 0x10 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 320X240 QVGA */
|
|
|
|
static struct sensor_register ov2659_qvga[] = {
|
|
|
|
{ REG_TIMING_HS_H, 0x00 },
|
|
|
|
{ REG_TIMING_HS_L, 0x00 },
|
|
|
|
{ REG_TIMING_VS_H, 0x00 },
|
|
|
|
{ REG_TIMING_VS_L, 0x00 },
|
|
|
|
{ REG_TIMING_HW_H, 0x06 },
|
|
|
|
{ REG_TIMING_HW_L, 0x5f },
|
|
|
|
{ REG_TIMING_VH_H, 0x04 },
|
|
|
|
{ REG_TIMING_VH_L, 0xb7 },
|
|
|
|
{ REG_TIMING_DVPHO_H, 0x01 },
|
|
|
|
{ REG_TIMING_DVPHO_L, 0x40 },
|
|
|
|
{ REG_TIMING_DVPVO_H, 0x00 },
|
|
|
|
{ REG_TIMING_DVPVO_L, 0xf0 },
|
|
|
|
{ REG_TIMING_HTS_H, 0x05 },
|
|
|
|
{ REG_TIMING_HTS_L, 0x14 },
|
|
|
|
{ REG_TIMING_VTS_H, 0x02 },
|
|
|
|
{ REG_TIMING_VTS_L, 0x68 },
|
|
|
|
{ REG_TIMING_HOFFS_L, 0x08 },
|
|
|
|
{ REG_TIMING_VOFFS_L, 0x02 },
|
|
|
|
{ REG_TIMING_XINC, 0x31 },
|
|
|
|
{ REG_TIMING_YINC, 0x31 },
|
|
|
|
{ 0x3a02, 0x02 },
|
|
|
|
{ 0x3a03, 0x68 },
|
|
|
|
{ 0x3a08, 0x00 },
|
|
|
|
{ 0x3a09, 0x5c },
|
|
|
|
{ 0x3a0a, 0x00 },
|
|
|
|
{ 0x3a0b, 0x4d },
|
|
|
|
{ 0x3a0d, 0x08 },
|
|
|
|
{ 0x3a0e, 0x06 },
|
|
|
|
{ 0x3a14, 0x02 },
|
|
|
|
{ 0x3a15, 0x28 },
|
|
|
|
{ 0x3623, 0x00 },
|
|
|
|
{ 0x3634, 0x76 },
|
|
|
|
{ 0x3701, 0x44 },
|
|
|
|
{ 0x3702, 0x18 },
|
|
|
|
{ 0x3703, 0x24 },
|
|
|
|
{ 0x3704, 0x24 },
|
|
|
|
{ 0x3705, 0x0c },
|
|
|
|
{ REG_TIMING_VERT_FORMAT, 0x81 },
|
|
|
|
{ REG_TIMING_HORIZ_FORMAT, 0x01 },
|
|
|
|
{ 0x370a, 0x52 },
|
|
|
|
{ REG_VFIFO_READ_START_H, 0x00 },
|
2019-09-30 06:06:37 -07:00
|
|
|
{ REG_VFIFO_READ_START_L, 0xa0 },
|
2015-03-20 14:03:52 -07:00
|
|
|
{ REG_ISP_CTRL02, 0x10 },
|
|
|
|
{ REG_NULL, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct pll_ctrl_reg ctrl3[] = {
|
|
|
|
{ 1, 0x00 },
|
|
|
|
{ 2, 0x02 },
|
|
|
|
{ 3, 0x03 },
|
|
|
|
{ 4, 0x06 },
|
|
|
|
{ 6, 0x0d },
|
|
|
|
{ 8, 0x0e },
|
|
|
|
{ 12, 0x0f },
|
|
|
|
{ 16, 0x12 },
|
|
|
|
{ 24, 0x13 },
|
|
|
|
{ 32, 0x16 },
|
|
|
|
{ 48, 0x1b },
|
|
|
|
{ 64, 0x1e },
|
|
|
|
{ 96, 0x1f },
|
|
|
|
{ 0, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct pll_ctrl_reg ctrl1[] = {
|
|
|
|
{ 2, 0x10 },
|
|
|
|
{ 4, 0x20 },
|
|
|
|
{ 6, 0x30 },
|
|
|
|
{ 8, 0x40 },
|
|
|
|
{ 10, 0x50 },
|
|
|
|
{ 12, 0x60 },
|
|
|
|
{ 14, 0x70 },
|
|
|
|
{ 16, 0x80 },
|
|
|
|
{ 18, 0x90 },
|
|
|
|
{ 20, 0xa0 },
|
|
|
|
{ 22, 0xb0 },
|
|
|
|
{ 24, 0xc0 },
|
|
|
|
{ 26, 0xd0 },
|
|
|
|
{ 28, 0xe0 },
|
|
|
|
{ 30, 0xf0 },
|
|
|
|
{ 0, 0x00 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct ov2659_framesize ov2659_framesizes[] = {
|
|
|
|
{ /* QVGA */
|
|
|
|
.width = 320,
|
|
|
|
.height = 240,
|
|
|
|
.regs = ov2659_qvga,
|
|
|
|
.max_exp_lines = 248,
|
|
|
|
}, { /* VGA */
|
|
|
|
.width = 640,
|
|
|
|
.height = 480,
|
|
|
|
.regs = ov2659_vga,
|
|
|
|
.max_exp_lines = 498,
|
|
|
|
}, { /* SVGA */
|
|
|
|
.width = 800,
|
|
|
|
.height = 600,
|
|
|
|
.regs = ov2659_svga,
|
|
|
|
.max_exp_lines = 498,
|
|
|
|
}, { /* XGA */
|
|
|
|
.width = 1024,
|
|
|
|
.height = 768,
|
|
|
|
.regs = ov2659_xga,
|
|
|
|
.max_exp_lines = 498,
|
|
|
|
}, { /* 720P */
|
|
|
|
.width = 1280,
|
|
|
|
.height = 720,
|
|
|
|
.regs = ov2659_720p,
|
|
|
|
.max_exp_lines = 498,
|
|
|
|
}, { /* SXGA */
|
|
|
|
.width = 1280,
|
|
|
|
.height = 1024,
|
|
|
|
.regs = ov2659_sxga,
|
|
|
|
.max_exp_lines = 1048,
|
|
|
|
}, { /* UXGA */
|
|
|
|
.width = 1600,
|
|
|
|
.height = 1200,
|
|
|
|
.regs = ov2659_uxga,
|
|
|
|
.max_exp_lines = 498,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
/* YUV422 YUYV*/
|
|
|
|
static struct sensor_register ov2659_format_yuyv[] = {
|
|
|
|
{ REG_FORMAT_CTRL00, 0x30 },
|
|
|
|
{ REG_NULL, 0x0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* YUV422 UYVY */
|
|
|
|
static struct sensor_register ov2659_format_uyvy[] = {
|
|
|
|
{ REG_FORMAT_CTRL00, 0x32 },
|
|
|
|
{ REG_NULL, 0x0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Raw Bayer BGGR */
|
|
|
|
static struct sensor_register ov2659_format_bggr[] = {
|
|
|
|
{ REG_FORMAT_CTRL00, 0x00 },
|
|
|
|
{ REG_NULL, 0x0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* RGB565 */
|
|
|
|
static struct sensor_register ov2659_format_rgb565[] = {
|
|
|
|
{ REG_FORMAT_CTRL00, 0x60 },
|
|
|
|
{ REG_NULL, 0x0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct ov2659_pixfmt ov2659_formats[] = {
|
|
|
|
{
|
|
|
|
.code = MEDIA_BUS_FMT_YUYV8_2X8,
|
|
|
|
.format_ctrl_regs = ov2659_format_yuyv,
|
|
|
|
}, {
|
|
|
|
.code = MEDIA_BUS_FMT_UYVY8_2X8,
|
|
|
|
.format_ctrl_regs = ov2659_format_uyvy,
|
|
|
|
}, {
|
|
|
|
.code = MEDIA_BUS_FMT_RGB565_2X8_BE,
|
|
|
|
.format_ctrl_regs = ov2659_format_rgb565,
|
|
|
|
}, {
|
|
|
|
.code = MEDIA_BUS_FMT_SBGGR8_1X8,
|
|
|
|
.format_ctrl_regs = ov2659_format_bggr,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline struct ov2659 *to_ov2659(struct v4l2_subdev *sd)
|
|
|
|
{
|
|
|
|
return container_of(sd, struct ov2659, sd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sensor register write */
|
|
|
|
static int ov2659_write(struct i2c_client *client, u16 reg, u8 val)
|
|
|
|
{
|
|
|
|
struct i2c_msg msg;
|
|
|
|
u8 buf[3];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
buf[0] = reg >> 8;
|
|
|
|
buf[1] = reg & 0xFF;
|
|
|
|
buf[2] = val;
|
|
|
|
|
|
|
|
msg.addr = client->addr;
|
|
|
|
msg.flags = client->flags;
|
|
|
|
msg.buf = buf;
|
|
|
|
msg.len = sizeof(buf);
|
|
|
|
|
|
|
|
ret = i2c_transfer(client->adapter, &msg, 1);
|
|
|
|
if (ret >= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev,
|
|
|
|
"ov2659 write reg(0x%x val:0x%x) failed !\n", reg, val);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sensor register read */
|
|
|
|
static int ov2659_read(struct i2c_client *client, u16 reg, u8 *val)
|
|
|
|
{
|
|
|
|
struct i2c_msg msg[2];
|
|
|
|
u8 buf[2];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
buf[0] = reg >> 8;
|
|
|
|
buf[1] = reg & 0xFF;
|
|
|
|
|
|
|
|
msg[0].addr = client->addr;
|
|
|
|
msg[0].flags = client->flags;
|
|
|
|
msg[0].buf = buf;
|
|
|
|
msg[0].len = sizeof(buf);
|
|
|
|
|
|
|
|
msg[1].addr = client->addr;
|
|
|
|
msg[1].flags = client->flags | I2C_M_RD;
|
|
|
|
msg[1].buf = buf;
|
|
|
|
msg[1].len = 1;
|
|
|
|
|
|
|
|
ret = i2c_transfer(client->adapter, msg, 2);
|
|
|
|
if (ret >= 0) {
|
|
|
|
*val = buf[0];
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_dbg(&client->dev,
|
|
|
|
"ov2659 read reg(0x%x val:0x%x) failed !\n", reg, *val);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_write_array(struct i2c_client *client,
|
|
|
|
const struct sensor_register *regs)
|
|
|
|
{
|
|
|
|
int i, ret = 0;
|
|
|
|
|
|
|
|
for (i = 0; ret == 0 && regs[i].addr; i++)
|
|
|
|
ret = ov2659_write(client, regs[i].addr, regs[i].value);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ov2659_pll_calc_params(struct ov2659 *ov2659)
|
|
|
|
{
|
|
|
|
const struct ov2659_platform_data *pdata = ov2659->pdata;
|
|
|
|
u8 ctrl1_reg = 0, ctrl2_reg = 0, ctrl3_reg = 0;
|
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
unsigned int desired = pdata->link_frequency;
|
|
|
|
u32 prediv, postdiv, mult;
|
|
|
|
u32 bestdelta = -1;
|
|
|
|
u32 delta, actual;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; ctrl1[i].div != 0; i++) {
|
|
|
|
postdiv = ctrl1[i].div;
|
|
|
|
for (j = 0; ctrl3[j].div != 0; j++) {
|
|
|
|
prediv = ctrl3[j].div;
|
|
|
|
for (mult = 1; mult <= 63; mult++) {
|
|
|
|
actual = ov2659->xvclk_frequency;
|
|
|
|
actual *= mult;
|
|
|
|
actual /= prediv;
|
|
|
|
actual /= postdiv;
|
|
|
|
delta = actual - desired;
|
|
|
|
delta = abs(delta);
|
|
|
|
|
|
|
|
if ((delta < bestdelta) || (bestdelta == -1)) {
|
|
|
|
bestdelta = delta;
|
|
|
|
ctrl1_reg = ctrl1[i].reg;
|
|
|
|
ctrl2_reg = mult;
|
|
|
|
ctrl3_reg = ctrl3[j].reg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ov2659->pll.ctrl1 = ctrl1_reg;
|
|
|
|
ov2659->pll.ctrl2 = ctrl2_reg;
|
|
|
|
ov2659->pll.ctrl3 = ctrl3_reg;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev,
|
|
|
|
"Actual reg config: ctrl1_reg: %02x ctrl2_reg: %02x ctrl3_reg: %02x\n",
|
|
|
|
ctrl1_reg, ctrl2_reg, ctrl3_reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_set_pixel_clock(struct ov2659 *ov2659)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
struct sensor_register pll_regs[] = {
|
|
|
|
{REG_SC_PLL_CTRL1, ov2659->pll.ctrl1},
|
|
|
|
{REG_SC_PLL_CTRL2, ov2659->pll.ctrl2},
|
|
|
|
{REG_SC_PLL_CTRL3, ov2659->pll.ctrl3},
|
|
|
|
{REG_NULL, 0x00},
|
|
|
|
};
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s\n", __func__);
|
|
|
|
|
|
|
|
return ov2659_write_array(client, pll_regs);
|
|
|
|
};
|
|
|
|
|
|
|
|
static void ov2659_get_default_format(struct v4l2_mbus_framefmt *format)
|
|
|
|
{
|
|
|
|
format->width = ov2659_framesizes[2].width;
|
|
|
|
format->height = ov2659_framesizes[2].height;
|
|
|
|
format->colorspace = V4L2_COLORSPACE_SRGB;
|
|
|
|
format->code = ov2659_formats[0].code;
|
|
|
|
format->field = V4L2_FIELD_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ov2659_set_streaming(struct ov2659 *ov2659, int on)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
on = !!on;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s: on: %d\n", __func__, on);
|
|
|
|
|
|
|
|
ret = ov2659_write(client, REG_SOFTWARE_STANDBY, on);
|
|
|
|
if (ret)
|
|
|
|
dev_err(&client->dev, "ov2659 soft standby failed\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_init(struct v4l2_subdev *sd, u32 val)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
|
|
|
|
return ov2659_write_array(client, ov2659_init_regs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* V4L2 subdev video and pad level operations
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int ov2659_enum_mbus_code(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2015-03-20 14:03:52 -07:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
|
|
|
if (code->index >= ARRAY_SIZE(ov2659_formats))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
code->code = ov2659_formats[code->index].code;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_enum_frame_sizes(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2015-03-20 14:03:52 -07:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
int i = ARRAY_SIZE(ov2659_formats);
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
|
|
|
if (fse->index >= ARRAY_SIZE(ov2659_framesizes))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
while (--i)
|
|
|
|
if (fse->code == ov2659_formats[i].code)
|
|
|
|
break;
|
|
|
|
|
|
|
|
fse->code = ov2659_formats[i].code;
|
|
|
|
|
|
|
|
fse->min_width = ov2659_framesizes[fse->index].width;
|
|
|
|
fse->max_width = fse->min_width;
|
|
|
|
fse->max_height = ov2659_framesizes[fse->index].height;
|
|
|
|
fse->min_height = fse->max_height;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_get_fmt(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2015-03-20 14:03:52 -07:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "ov2659_get_fmt\n");
|
|
|
|
|
|
|
|
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
|
2015-05-14 15:27:45 -07:00
|
|
|
struct v4l2_mbus_framefmt *mf;
|
|
|
|
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
mf = v4l2_subdev_state_get_format(sd_state, 0);
|
2015-03-20 14:03:52 -07:00
|
|
|
mutex_lock(&ov2659->lock);
|
|
|
|
fmt->format = *mf;
|
|
|
|
mutex_unlock(&ov2659->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&ov2659->lock);
|
|
|
|
fmt->format = ov2659->format;
|
|
|
|
mutex_unlock(&ov2659->lock);
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "ov2659_get_fmt: %x %dx%d\n",
|
|
|
|
ov2659->format.code, ov2659->format.width,
|
|
|
|
ov2659->format.height);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __ov2659_try_frame_size(struct v4l2_mbus_framefmt *mf,
|
|
|
|
const struct ov2659_framesize **size)
|
|
|
|
{
|
|
|
|
const struct ov2659_framesize *fsize = &ov2659_framesizes[0];
|
|
|
|
const struct ov2659_framesize *match = NULL;
|
|
|
|
int i = ARRAY_SIZE(ov2659_framesizes);
|
|
|
|
unsigned int min_err = UINT_MAX;
|
|
|
|
|
|
|
|
while (i--) {
|
|
|
|
int err = abs(fsize->width - mf->width)
|
|
|
|
+ abs(fsize->height - mf->height);
|
|
|
|
if ((err < min_err) && (fsize->regs[0].addr)) {
|
|
|
|
min_err = err;
|
|
|
|
match = fsize;
|
|
|
|
}
|
|
|
|
fsize++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!match)
|
|
|
|
match = &ov2659_framesizes[2];
|
|
|
|
|
|
|
|
mf->width = match->width;
|
|
|
|
mf->height = match->height;
|
|
|
|
|
|
|
|
if (size)
|
|
|
|
*size = match;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_set_fmt(struct v4l2_subdev *sd,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 07:55:58 -07:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2015-03-20 14:03:52 -07:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2015-04-15 12:12:18 -07:00
|
|
|
int index = ARRAY_SIZE(ov2659_formats);
|
2015-03-20 14:03:52 -07:00
|
|
|
struct v4l2_mbus_framefmt *mf = &fmt->format;
|
|
|
|
const struct ov2659_framesize *size = NULL;
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "ov2659_set_fmt\n");
|
|
|
|
|
|
|
|
__ov2659_try_frame_size(mf, &size);
|
|
|
|
|
|
|
|
while (--index >= 0)
|
|
|
|
if (ov2659_formats[index].code == mf->code)
|
|
|
|
break;
|
|
|
|
|
2019-03-30 07:01:31 -07:00
|
|
|
if (index < 0) {
|
|
|
|
index = 0;
|
|
|
|
mf->code = ov2659_formats[index].code;
|
|
|
|
}
|
2015-03-20 14:03:52 -07:00
|
|
|
|
|
|
|
mf->colorspace = V4L2_COLORSPACE_SRGB;
|
|
|
|
mf->field = V4L2_FIELD_NONE;
|
|
|
|
|
|
|
|
mutex_lock(&ov2659->lock);
|
|
|
|
|
|
|
|
if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
|
2015-03-20 14:03:52 -07:00
|
|
|
*mf = fmt->format;
|
|
|
|
} else {
|
|
|
|
s64 val;
|
|
|
|
|
|
|
|
if (ov2659->streaming) {
|
|
|
|
mutex_unlock(&ov2659->lock);
|
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
ov2659->frame_size = size;
|
|
|
|
ov2659->format = fmt->format;
|
|
|
|
ov2659->format_ctrl_regs =
|
|
|
|
ov2659_formats[index].format_ctrl_regs;
|
|
|
|
|
|
|
|
if (ov2659->format.code != MEDIA_BUS_FMT_SBGGR8_1X8)
|
|
|
|
val = ov2659->pdata->link_frequency / 2;
|
|
|
|
else
|
|
|
|
val = ov2659->pdata->link_frequency;
|
|
|
|
|
|
|
|
ret = v4l2_ctrl_s_ctrl_int64(ov2659->link_frequency, val);
|
|
|
|
if (ret < 0)
|
|
|
|
dev_warn(&client->dev,
|
|
|
|
"failed to set link_frequency rate (%d)\n",
|
|
|
|
ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&ov2659->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_set_frame_size(struct ov2659 *ov2659)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s\n", __func__);
|
|
|
|
|
|
|
|
return ov2659_write_array(ov2659->client, ov2659->frame_size->regs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_set_format(struct ov2659 *ov2659)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s\n", __func__);
|
|
|
|
|
|
|
|
return ov2659_write_array(ov2659->client, ov2659->format_ctrl_regs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_s_stream(struct v4l2_subdev *sd, int on)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s: on: %d\n", __func__, on);
|
|
|
|
|
|
|
|
mutex_lock(&ov2659->lock);
|
|
|
|
|
|
|
|
on = !!on;
|
|
|
|
|
|
|
|
if (ov2659->streaming == on)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
if (!on) {
|
|
|
|
/* Stop Streaming Sequence */
|
|
|
|
ov2659_set_streaming(ov2659, 0);
|
|
|
|
ov2659->streaming = on;
|
2019-09-30 06:06:42 -07:00
|
|
|
pm_runtime_put(&client->dev);
|
2015-03-20 14:03:52 -07:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2021-04-23 08:19:14 -07:00
|
|
|
ret = pm_runtime_resume_and_get(&client->dev);
|
|
|
|
if (ret < 0)
|
2019-09-30 06:06:42 -07:00
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
ret = ov2659_init(sd, 0);
|
|
|
|
if (!ret)
|
|
|
|
ret = ov2659_set_pixel_clock(ov2659);
|
2019-09-30 06:06:40 -07:00
|
|
|
if (!ret)
|
|
|
|
ret = ov2659_set_frame_size(ov2659);
|
|
|
|
if (!ret)
|
|
|
|
ret = ov2659_set_format(ov2659);
|
|
|
|
if (!ret) {
|
|
|
|
ov2659_set_streaming(ov2659, 1);
|
|
|
|
ov2659->streaming = on;
|
|
|
|
}
|
2015-03-20 14:03:52 -07:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
mutex_unlock(&ov2659->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_set_test_pattern(struct ov2659 *ov2659, int value)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(&ov2659->sd);
|
|
|
|
int ret;
|
|
|
|
u8 val;
|
|
|
|
|
|
|
|
ret = ov2659_read(client, REG_PRE_ISP_CTRL00, &val);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
switch (value) {
|
|
|
|
case 0:
|
|
|
|
val &= ~TEST_PATTERN_ENABLE;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
val &= VERTICAL_COLOR_BAR_MASK;
|
|
|
|
val |= TEST_PATTERN_ENABLE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ov2659_write(client, REG_PRE_ISP_CTRL00, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
|
{
|
|
|
|
struct ov2659 *ov2659 =
|
|
|
|
container_of(ctrl->handler, struct ov2659, ctrls);
|
2019-09-30 06:06:42 -07:00
|
|
|
struct i2c_client *client = ov2659->client;
|
|
|
|
|
|
|
|
/* V4L2 controls values will be applied only when power is already up */
|
|
|
|
if (!pm_runtime_get_if_in_use(&client->dev))
|
|
|
|
return 0;
|
2015-03-20 14:03:52 -07:00
|
|
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
case V4L2_CID_TEST_PATTERN:
|
|
|
|
return ov2659_set_test_pattern(ov2659, ctrl->val);
|
|
|
|
}
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
pm_runtime_put(&client->dev);
|
2015-03-20 14:03:52 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-11-13 15:05:17 -07:00
|
|
|
static const struct v4l2_ctrl_ops ov2659_ctrl_ops = {
|
2015-03-20 14:03:52 -07:00
|
|
|
.s_ctrl = ov2659_s_ctrl,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const ov2659_test_pattern_menu[] = {
|
|
|
|
"Disabled",
|
|
|
|
"Vertical Color Bars",
|
|
|
|
};
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
static int ov2659_power_off(struct device *dev)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
|
|
|
gpiod_set_value(ov2659->pwdn_gpio, 1);
|
|
|
|
|
2021-05-03 22:09:53 -07:00
|
|
|
clk_disable_unprepare(ov2659->clk);
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ov2659_power_on(struct device *dev)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
2021-05-03 22:09:53 -07:00
|
|
|
int ret;
|
2019-09-30 06:06:42 -07:00
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
2021-05-03 22:09:53 -07:00
|
|
|
ret = clk_prepare_enable(ov2659->clk);
|
|
|
|
if (ret) {
|
|
|
|
dev_err(&client->dev, "%s: failed to enable clock\n",
|
|
|
|
__func__);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
gpiod_set_value(ov2659->pwdn_gpio, 0);
|
|
|
|
|
|
|
|
if (ov2659->resetb_gpio) {
|
|
|
|
gpiod_set_value(ov2659->resetb_gpio, 1);
|
|
|
|
usleep_range(500, 1000);
|
|
|
|
gpiod_set_value(ov2659->resetb_gpio, 0);
|
|
|
|
usleep_range(3000, 5000);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* V4L2 subdev internal operations
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int ov2659_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
struct v4l2_mbus_framefmt *format =
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 00:37:10 -07:00
|
|
|
v4l2_subdev_state_get_format(fh->state, 0);
|
2015-03-20 14:03:52 -07:00
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
|
|
|
ov2659_get_default_format(format);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_core_ops ov2659_subdev_core_ops = {
|
|
|
|
.log_status = v4l2_ctrl_subdev_log_status,
|
|
|
|
.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
|
|
|
|
.unsubscribe_event = v4l2_event_subdev_unsubscribe,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_video_ops ov2659_subdev_video_ops = {
|
|
|
|
.s_stream = ov2659_s_stream,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_pad_ops ov2659_subdev_pad_ops = {
|
|
|
|
.enum_mbus_code = ov2659_enum_mbus_code,
|
|
|
|
.enum_frame_size = ov2659_enum_frame_sizes,
|
|
|
|
.get_fmt = ov2659_get_fmt,
|
|
|
|
.set_fmt = ov2659_set_fmt,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_ops ov2659_subdev_ops = {
|
|
|
|
.core = &ov2659_subdev_core_ops,
|
|
|
|
.video = &ov2659_subdev_video_ops,
|
|
|
|
.pad = &ov2659_subdev_pad_ops,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_subdev_internal_ops ov2659_subdev_internal_ops = {
|
|
|
|
.open = ov2659_open,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int ov2659_detect(struct v4l2_subdev *sd)
|
|
|
|
{
|
|
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
2017-05-03 17:13:18 -07:00
|
|
|
u8 pid = 0;
|
|
|
|
u8 ver = 0;
|
2015-03-20 14:03:52 -07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
dev_dbg(&client->dev, "%s:\n", __func__);
|
|
|
|
|
|
|
|
ret = ov2659_write(client, REG_SOFTWARE_RESET, 0x01);
|
|
|
|
if (ret != 0) {
|
|
|
|
dev_err(&client->dev, "Sensor soft reset failed\n");
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
usleep_range(1000, 2000);
|
|
|
|
|
|
|
|
/* Check sensor revision */
|
|
|
|
ret = ov2659_read(client, REG_SC_CHIP_ID_H, &pid);
|
|
|
|
if (!ret)
|
|
|
|
ret = ov2659_read(client, REG_SC_CHIP_ID_L, &ver);
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
unsigned short id;
|
|
|
|
|
|
|
|
id = OV265X_ID(pid, ver);
|
2019-09-30 06:06:38 -07:00
|
|
|
if (id != OV2659_ID) {
|
2015-03-20 14:03:52 -07:00
|
|
|
dev_err(&client->dev,
|
2021-05-05 13:17:17 -07:00
|
|
|
"Sensor detection failed (%04X)\n", id);
|
2019-09-30 06:06:38 -07:00
|
|
|
ret = -ENODEV;
|
|
|
|
} else {
|
2015-03-20 14:03:52 -07:00
|
|
|
dev_info(&client->dev, "Found OV%04X sensor\n", id);
|
2015-12-21 06:54:46 -07:00
|
|
|
}
|
2015-03-20 14:03:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ov2659_platform_data *
|
|
|
|
ov2659_get_pdata(struct i2c_client *client)
|
|
|
|
{
|
|
|
|
struct ov2659_platform_data *pdata;
|
2018-06-02 09:19:35 -07:00
|
|
|
struct v4l2_fwnode_endpoint bus_cfg = { .bus_type = 0 };
|
2015-03-20 14:03:52 -07:00
|
|
|
struct device_node *endpoint;
|
2018-06-02 09:19:35 -07:00
|
|
|
int ret;
|
2015-03-20 14:03:52 -07:00
|
|
|
|
|
|
|
if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
|
|
|
|
return client->dev.platform_data;
|
|
|
|
|
2024-02-19 18:16:21 -07:00
|
|
|
endpoint = of_graph_get_endpoint_by_regs(client->dev.of_node, 0, -1);
|
2015-03-20 14:03:52 -07:00
|
|
|
if (!endpoint)
|
|
|
|
return NULL;
|
|
|
|
|
2018-06-02 09:19:35 -07:00
|
|
|
ret = v4l2_fwnode_endpoint_alloc_parse(of_fwnode_handle(endpoint),
|
|
|
|
&bus_cfg);
|
|
|
|
if (ret) {
|
2015-04-15 14:14:17 -07:00
|
|
|
pdata = NULL;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
|
|
|
|
if (!pdata)
|
|
|
|
goto done;
|
|
|
|
|
2018-06-02 09:19:35 -07:00
|
|
|
if (!bus_cfg.nr_of_link_frequencies) {
|
2015-04-15 14:14:17 -07:00
|
|
|
dev_err(&client->dev,
|
|
|
|
"link-frequencies property not found or too many\n");
|
2015-03-20 14:03:52 -07:00
|
|
|
pdata = NULL;
|
2015-04-15 14:14:17 -07:00
|
|
|
goto done;
|
2015-03-20 14:03:52 -07:00
|
|
|
}
|
|
|
|
|
2018-06-02 09:19:35 -07:00
|
|
|
pdata->link_frequency = bus_cfg.link_frequencies[0];
|
2015-04-15 14:14:17 -07:00
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
done:
|
2018-06-02 09:19:35 -07:00
|
|
|
v4l2_fwnode_endpoint_free(&bus_cfg);
|
2015-03-20 14:03:52 -07:00
|
|
|
of_node_put(endpoint);
|
|
|
|
return pdata;
|
|
|
|
}
|
|
|
|
|
2019-07-10 14:51:49 -07:00
|
|
|
static int ov2659_probe(struct i2c_client *client)
|
2015-03-20 14:03:52 -07:00
|
|
|
{
|
|
|
|
const struct ov2659_platform_data *pdata = ov2659_get_pdata(client);
|
|
|
|
struct v4l2_subdev *sd;
|
|
|
|
struct ov2659 *ov2659;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!pdata) {
|
|
|
|
dev_err(&client->dev, "platform data not specified\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ov2659 = devm_kzalloc(&client->dev, sizeof(*ov2659), GFP_KERNEL);
|
|
|
|
if (!ov2659)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ov2659->pdata = pdata;
|
|
|
|
ov2659->client = client;
|
|
|
|
|
2021-05-03 22:09:53 -07:00
|
|
|
ov2659->clk = devm_clk_get(&client->dev, "xvclk");
|
|
|
|
if (IS_ERR(ov2659->clk))
|
|
|
|
return PTR_ERR(ov2659->clk);
|
2015-03-20 14:03:52 -07:00
|
|
|
|
2021-05-03 22:09:53 -07:00
|
|
|
ov2659->xvclk_frequency = clk_get_rate(ov2659->clk);
|
2015-03-20 14:03:52 -07:00
|
|
|
if (ov2659->xvclk_frequency < 6000000 ||
|
|
|
|
ov2659->xvclk_frequency > 27000000)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
/* Optional gpio don't fail if not present */
|
|
|
|
ov2659->pwdn_gpio = devm_gpiod_get_optional(&client->dev, "powerdown",
|
|
|
|
GPIOD_OUT_LOW);
|
|
|
|
if (IS_ERR(ov2659->pwdn_gpio))
|
|
|
|
return PTR_ERR(ov2659->pwdn_gpio);
|
|
|
|
|
|
|
|
/* Optional gpio don't fail if not present */
|
|
|
|
ov2659->resetb_gpio = devm_gpiod_get_optional(&client->dev, "reset",
|
|
|
|
GPIOD_OUT_HIGH);
|
|
|
|
if (IS_ERR(ov2659->resetb_gpio))
|
|
|
|
return PTR_ERR(ov2659->resetb_gpio);
|
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
v4l2_ctrl_handler_init(&ov2659->ctrls, 2);
|
|
|
|
ov2659->link_frequency =
|
|
|
|
v4l2_ctrl_new_std(&ov2659->ctrls, &ov2659_ctrl_ops,
|
|
|
|
V4L2_CID_PIXEL_RATE,
|
|
|
|
pdata->link_frequency / 2,
|
|
|
|
pdata->link_frequency, 1,
|
|
|
|
pdata->link_frequency);
|
|
|
|
v4l2_ctrl_new_std_menu_items(&ov2659->ctrls, &ov2659_ctrl_ops,
|
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
|
ARRAY_SIZE(ov2659_test_pattern_menu) - 1,
|
|
|
|
0, 0, ov2659_test_pattern_menu);
|
|
|
|
ov2659->sd.ctrl_handler = &ov2659->ctrls;
|
|
|
|
|
|
|
|
if (ov2659->ctrls.error) {
|
|
|
|
dev_err(&client->dev, "%s: control initialization error %d\n",
|
|
|
|
__func__, ov2659->ctrls.error);
|
|
|
|
return ov2659->ctrls.error;
|
|
|
|
}
|
|
|
|
|
|
|
|
sd = &ov2659->sd;
|
|
|
|
client->flags |= I2C_CLIENT_SCCB;
|
|
|
|
|
2023-09-11 07:56:36 -07:00
|
|
|
v4l2_i2c_subdev_init(sd, client, &ov2659_subdev_ops);
|
2015-03-20 14:03:52 -07:00
|
|
|
sd->internal_ops = &ov2659_subdev_internal_ops;
|
|
|
|
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
|
|
|
|
V4L2_SUBDEV_FL_HAS_EVENTS;
|
|
|
|
|
|
|
|
ov2659->pad.flags = MEDIA_PAD_FL_SOURCE;
|
2015-12-10 12:25:41 -07:00
|
|
|
sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
|
2015-12-11 02:44:40 -07:00
|
|
|
ret = media_entity_pads_init(&sd->entity, 1, &ov2659->pad);
|
2015-03-20 14:03:52 -07:00
|
|
|
if (ret < 0) {
|
|
|
|
v4l2_ctrl_handler_free(&ov2659->ctrls);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_init(&ov2659->lock);
|
|
|
|
|
|
|
|
ov2659_get_default_format(&ov2659->format);
|
|
|
|
ov2659->frame_size = &ov2659_framesizes[2];
|
|
|
|
ov2659->format_ctrl_regs = ov2659_formats[0].format_ctrl_regs;
|
|
|
|
|
2021-05-03 22:09:53 -07:00
|
|
|
ret = ov2659_power_on(&client->dev);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
2019-09-30 06:06:42 -07:00
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
ret = ov2659_detect(sd);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Calculate the PLL register value needed */
|
|
|
|
ov2659_pll_calc_params(ov2659);
|
|
|
|
|
|
|
|
ret = v4l2_async_register_subdev(&ov2659->sd);
|
|
|
|
if (ret)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
dev_info(&client->dev, "%s sensor driver registered !!\n", sd->name);
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
pm_runtime_set_active(&client->dev);
|
|
|
|
pm_runtime_enable(&client->dev);
|
|
|
|
pm_runtime_idle(&client->dev);
|
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
v4l2_ctrl_handler_free(&ov2659->ctrls);
|
2019-09-30 06:06:42 -07:00
|
|
|
ov2659_power_off(&client->dev);
|
2015-03-20 14:03:52 -07:00
|
|
|
media_entity_cleanup(&sd->entity);
|
|
|
|
mutex_destroy(&ov2659->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2022-08-15 01:02:30 -07:00
|
|
|
static void ov2659_remove(struct i2c_client *client)
|
2015-03-20 14:03:52 -07:00
|
|
|
{
|
|
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
struct ov2659 *ov2659 = to_ov2659(sd);
|
|
|
|
|
|
|
|
v4l2_ctrl_handler_free(&ov2659->ctrls);
|
|
|
|
v4l2_async_unregister_subdev(sd);
|
|
|
|
media_entity_cleanup(&sd->entity);
|
|
|
|
mutex_destroy(&ov2659->lock);
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
pm_runtime_disable(&client->dev);
|
|
|
|
if (!pm_runtime_status_suspended(&client->dev))
|
|
|
|
ov2659_power_off(&client->dev);
|
|
|
|
pm_runtime_set_suspended(&client->dev);
|
2015-03-20 14:03:52 -07:00
|
|
|
}
|
|
|
|
|
2019-09-30 06:06:42 -07:00
|
|
|
static const struct dev_pm_ops ov2659_pm_ops = {
|
|
|
|
SET_RUNTIME_PM_OPS(ov2659_power_off, ov2659_power_on, NULL)
|
|
|
|
};
|
|
|
|
|
2015-03-20 14:03:52 -07:00
|
|
|
static const struct i2c_device_id ov2659_id[] = {
|
2024-05-08 06:20:42 -07:00
|
|
|
{ "ov2659" },
|
|
|
|
{ /* sentinel */ }
|
2015-03-20 14:03:52 -07:00
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(i2c, ov2659_id);
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_OF)
|
|
|
|
static const struct of_device_id ov2659_of_match[] = {
|
|
|
|
{ .compatible = "ovti,ov2659", },
|
|
|
|
{ /* sentinel */ },
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, ov2659_of_match);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static struct i2c_driver ov2659_i2c_driver = {
|
|
|
|
.driver = {
|
|
|
|
.name = DRIVER_NAME,
|
2019-09-30 06:06:42 -07:00
|
|
|
.pm = &ov2659_pm_ops,
|
2015-03-20 14:03:52 -07:00
|
|
|
.of_match_table = of_match_ptr(ov2659_of_match),
|
|
|
|
},
|
2023-05-14 05:04:07 -07:00
|
|
|
.probe = ov2659_probe,
|
2015-03-20 14:03:52 -07:00
|
|
|
.remove = ov2659_remove,
|
|
|
|
.id_table = ov2659_id,
|
|
|
|
};
|
|
|
|
|
|
|
|
module_i2c_driver(ov2659_i2c_driver);
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Benoit Parrot <bparrot@ti.com>");
|
|
|
|
MODULE_DESCRIPTION("OV2659 CMOS Image Sensor driver");
|
|
|
|
MODULE_LICENSE("GPL v2");
|