* [PATCH v2 0/3] Add v4l2 subdev driver for S5K6AAFX sensor @ 2011-09-21 17:45 Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 1/2] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 0 siblings, 2 replies; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-21 17:45 UTC (permalink / raw) To: linux-media Cc: m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim, s.nawrocki Hello The following change set adds subdev driver for S5K6AAFX sensor with embedded ISP SoC, and minor v4l2 control API enhancement. Changes since v1: - improved s5k6aa_initialize_ctrls() - fixed pixel resolution update issue which in some cases resulted in cropping where scaling was expected - used V4L2_COLORFX_SKY_BLUE instead of V4L2_COLORFX_AQUA - dropped patch adding V4L2_COLORFX_AQUA entry for V4L2_CID_COLORFX control - patch 2/2 - no changes Sylwester Nawrocki (2): v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control v4l: Add v4l2 subdev driver for S5K6AAFX sensor Documentation/DocBook/media/v4l/controls.xml | 5 +- drivers/media/video/Kconfig | 7 + drivers/media/video/Makefile | 1 + drivers/media/video/s5k6aa.c | 1482 ++++++++++++++++++++++++++ drivers/media/video/v4l2-ctrls.c | 1 + include/linux/videodev2.h | 1 + include/media/s5k6aa.h | 51 + 7 files changed, 1546 insertions(+), 2 deletions(-) create mode 100644 drivers/media/video/s5k6aa.c create mode 100644 include/media/s5k6aa.h Thanks, -- Sylwester Nawrocki Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 1/2] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control 2011-09-21 17:45 [PATCH v2 0/3] Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki @ 2011-09-21 17:45 ` Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 1 sibling, 0 replies; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-21 17:45 UTC (permalink / raw) To: linux-media Cc: m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim, s.nawrocki V4L2_CID_POWER_LINE_FREQUENCY control allows applications to instruct a driver what is the power line frequency so an appropriate filter can be used by the device to cancel flicker by compensating the light intensity ripple. Currently in the menu we have entries for 50 Hz and 60 Hz and for entirely disabling the anti-flicker filter. However some devices are capable of automatically detecting the frequency, so add V4L2_CID_POWER_LINE_FREQUENCY_AUTO entry for them. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- Documentation/DocBook/media/v4l/controls.xml | 5 +++-- drivers/media/video/v4l2-ctrls.c | 1 + include/linux/videodev2.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 23fdf79..3bc5ee8 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the <entry>Enables a power line frequency filter to avoid flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are: <constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0), -<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1) and -<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2).</entry> +<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1), +<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2) and +<constant>V4L2_CID_POWER_LINE_FREQUENCY_AUTO</constant> (3).</entry> </row> <row> <entry><constant>V4L2_CID_HUE_AUTO</constant></entry> diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index 06b6014..20abe5d 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c @@ -210,6 +210,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Disabled", "50 Hz", "60 Hz", + "Auto", NULL }; static const char * const camera_exposure_auto[] = { diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index a5359c6..b433968 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1125,6 +1125,7 @@ enum v4l2_power_line_frequency { V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0, V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1, V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2, + V4L2_CID_POWER_LINE_FREQUENCY_AUTO = 3, }; #define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) #define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) -- 1.7.6.3 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-21 17:45 [PATCH v2 0/3] Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 1/2] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control Sylwester Nawrocki @ 2011-09-21 17:45 ` Sylwester Nawrocki 2011-09-22 22:02 ` Sakari Ailus 2011-09-26 13:21 ` Hans Verkuil 1 sibling, 2 replies; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-21 17:45 UTC (permalink / raw) To: linux-media Cc: m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim, s.nawrocki This driver exposes preview mode operation of the S5K6AAFX sensor with embedded SoC ISP. It uses one of the five user predefined configuration register sets. There is yet no support for capture (snapshot) operation. Following controls are supported: manual/auto exposure and gain, power line frequency (anti-flicker), saturation, sharpness, brightness, contrast, white balance temperature, color effects, horizontal/vertical image flip, frame interval. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- drivers/media/video/Kconfig | 7 + drivers/media/video/Makefile | 1 + drivers/media/video/s5k6aa.c | 1482 ++++++++++++++++++++++++++++++++++++++++++ include/media/s5k6aa.h | 51 ++ 4 files changed, 1541 insertions(+), 0 deletions(-) create mode 100644 drivers/media/video/s5k6aa.c create mode 100644 include/media/s5k6aa.h diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 9da6044..ccc8172 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -496,6 +496,13 @@ config VIDEO_TCM825X This is a driver for the Toshiba TCM825x VGA camera sensor. It is used for example in Nokia N800. +config VIDEO_S5K6AA + tristate "Samsung S5K6AAFX sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + ---help--- + This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M + camera sensor with an embedded SoC image signal processor. + comment "Flash devices" config VIDEO_ADP1653 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index f52a771..526cb32 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -71,6 +71,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ +obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c new file mode 100644 index 0000000..43b7dac --- /dev/null +++ b/drivers/media/video/s5k6aa.c @@ -0,0 +1,1482 @@ +/* + * Driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor + * with embedded SoC ISP. + * + * Copyright (C) 2011, Samsung Electronics Co., Ltd. + * Author: Sylwester Nawrocki <s.nawrocki@samsung.com> + * + * Based on a driver authored by Dongsoo Nathaniel Kim. + * Copyright (C) 2009, Dongsoo Nathaniel Kim <dongsoo45.kim@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * TODO: + * - add set/get_crop operations + * - add capture (snapshot) mode support + */ + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/gpio.h> +#include <linux/i2c.h> +#include <linux/media.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> + +#include <media/media-entity.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> +#include <media/v4l2-subdev.h> +#include <media/v4l2-mediabus.h> +#include <media/s5k6aa.h> + +static int debug; +module_param(debug, int, 0644); + +#define DRIVER_NAME "S5K6AA" + +/* The token to indicate array termination */ +#define S5K6AA_TERM 0xffff +#define S5K6AA_OUT_WIDTH_DEF 640 +#define S5K6AA_OUT_HEIGHT_DEF 480 +#define S5K6AA_WIN_WIDTH_MAX 1280 +#define S5K6AA_WIN_HEIGHT_MAX 1024 +#define S5K6AA_WIN_WIDTH_MIN 8 +#define S5K6AA_WIN_HEIGHT_MIN 8 + +/* + * H/W register Interface (0xD0000000 - 0xD0000FFF) + */ +#define AHB_MSB_ADDR_PTR 0xfcfc +#define GEN_REG_OFFSH 0xd000 +#define REG_SW_RESET 0x0010 +#define REG_SW_LOAD_COMPLETE 0x0014 +#define REG_CMDWR_ADDRH 0x0028 +#define REG_CMDWR_ADDRL 0x002a +#define REG_CMDRD_ADDRH 0x002c +#define REG_CMDRD_ADDRL 0x002e + +#define REG_CMDBUF0_ADDR 0x0f12 +#define REG_CMDBUF1_ADDR 0x0f10 + +/* + * Host S/W Register interface (0x70000000 - 0x70002000) + * The value of the two most significant address bytes is 0x7000, + * (HOST_SWIF_OFFS_H). The register addresses below specify 2 LSBs. + */ +#define HOST_SWIF_OFFSH 0x7000 + +/* Initialization parameters */ +/* Master clock frequency in KHz */ +#define REG_I_INCLK_FREQ_L 0x01b8 +#define REG_I_INCLK_FREQ_H 0x01ba +#define REG_I_USE_NPVI_CLOCKS 0x01c6 +#define REG_I_USE_NMIPI_CLOCKS 0x01c8 + +/* Clock configurations, n = 0..3. REG_I_* frequency unit is 4 kHz. */ +#define REG_I_OPCLK_4KHZ(n) ((n) * 6 + 0x01cc) +#define REG_I_MIN_OUTRATE_4KHZ(n) ((n) * 6 + 0x01ce) +#define REG_I_MAX_OUTRATE_4KHZ(n) ((n) * 6 + 0x01d0) +#define REG_I_INIT_PARAMS_UPDATED 0x01e0 +#define MIN_MCLK_FREQ_KHZ 6000U +#define MAX_MCLK_FREQ_KHZ 27000U +#define S5K6AA_MIN_PCLK_FREQ 12000U +#define S5K6AA_MAX_PCLK_FREQ 24000U + +/* General purpose parameters */ +#define REG_USER_BRIGHTNESS 0x01e4 +#define REG_USER_CONTRAST 0x01e6 +#define REG_USER_SATURATION 0x01e8 +#define REG_USER_SHARPBLUR 0x01ea +#define REG_G_SPEC_EFFECTS 0x01ee +#define REG_G_ENABLE_PREV 0x01f0 +#define REG_G_ENABLE_PREV_CHG 0x01f2 +#define REG_G_NEW_CFG_SYNC 0x01f8 + +#define REG_G_PREVZOOM_IN_WIDTH 0x020a +#define REG_G_PREVZOOM_IN_HEIGHT 0x020c +#define REG_G_PREVZOOM_IN_XOFFS 0x020e +#define REG_G_PREVZOOM_IN_YOFFS 0x0210 +#define REG_G_INPUTS_CHANGE_REQ 0x021a + +#define REG_G_ACTIVE_PREV_CFG 0x021c +#define REG_G_PREV_CFG_CHG 0x021e +#define REG_G_PREV_OPEN_AFTER_CH 0x0220 +#define REG_G_PREV_CFG_ERROR 0x0222 + +/* Preview control section. n = 0...4. */ +#define PREG(n, x) ((n) * 0x26 + x) +#define REG_P_OUT_WIDTH(n) PREG(n, 0x0242) +#define REG_P_OUT_HEIGHT(n) PREG(n, 0x0244) +#define REG_P_FMT(n) PREG(n, 0x0246) +#define REG_P_MAX_OUT_RATE(n) PREG(n, 0x0248) +#define REG_P_MIN_OUT_RATE(n) PREG(n, 0x024a) +#define REG_P_PVI_MASK(n) PREG(n, 0x024c) +#define REG_P_CLK_INDEX(n) PREG(n, 0x024e) +#define REG_P_FR_RATE_TYPE(n) PREG(n, 0x0250) +#define FR_RATE_DYNAMIC 0 +#define FR_RATE_FIXED 1 +#define FR_RATE_FIXED_ACCURATE 2 +#define REG_P_FR_RATE_Q_TYPE(n) PREG(n, 0x0252) +#define FR_RATE_Q_BEST_FRRATE 1 /* Binning enabled */ +#define FR_RATE_Q_BEST_QUALITY 2 /* Binning disabled */ +/* Frame period in 0.1 ms units */ +#define REG_P_MAX_FR_TIME(n) PREG(n, 0x0254) +#define REG_P_MIN_FR_TIME(n) PREG(n, 0x0256) +/* Conversion to REG_P_[MAX/MIN]_FR_TIME value; __t: time in us */ +#define US_TO_FR_TIME(__t) ((__t) / 100) +#define S5K6AA_MIN_FR_TIME 33300 /* us */ +#define S5K6AA_MAX_FR_TIME 650000 /* us */ +#define S5K6AA_MAX_HIGH_RES_FR_TIME 666 /* x100 us */ +/* The below 5 registers are for "device correction" values */ +#define REG_P_COLORTEMP(n) PREG(n, 0x025e) +#define REG_P_PREV_MIRROR(n) PREG(n, 0x0262) + +/* Extended image property controls */ +/* Exposure time in 10 us units */ +#define REG_SF_USR_EXPOSURE_L 0x03c6 +#define REG_SF_USR_EXPOSURE_H 0x03c8 +#define REG_SF_USR_EXPOSURE_CHG 0x03ca +#define REG_SF_USR_TOT_GAIN 0x03cc +#define REG_SF_USR_TOT_GAIN_CHG 0x03ce +#define REG_SF_FLICKER_QUANT 0x03dc +#define REG_SF_FLICKER_QUANT_CHG 0x03de + +/* Output interface (parallel/MIPI) setup */ +#define REG_OIF_EN_MIPI_LANES 0x03fa +#define REG_OIF_EN_PACKETS 0x03fc +#define REG_OIF_CFG_CHG 0x03fe + +/* Auto-algorithms enable mask */ +#define REG_DBG_AUTOALG_EN 0x0400 +#define AALG_ALL_EN_MASK (1 << 0) +#define AALG_AE_EN_MASK (1 << 1) +#define AALG_DIVLEI_EN_MASK (1 << 2) +#define AALG_WB_EN_MASK (1 << 3) +#define AALG_FLICKER_EN_MASK (1 << 5) +#define AALG_FIT_EN_MASK (1 << 6) +#define AALG_WRHW_EN_MASK (1 << 7) + +/* Firmware revision information */ +#define REG_FW_APIVER 0x012e +#define S5K6AAFX_FW_APIVER 0x0001 +#define REG_FW_REVISION 0x0130 + +/* For now we use only one user configuration register set */ +#define S5K6AA_MAX_PRESETS 1 + +static const char * const s5k6aa_supply_names[] = { + "vdd_core", /* Digital core supply 1.5V (1.4V to 1.6V) */ + "vdda", /* Analog power supply 2.8V (2.6V to 3.0V) */ + "vdd_reg", /* Regulator input power 1.8V (1.7V to 1.9V) + or 2.8V (2.6V to 3.0) */ + "vddio", /* I/O supply 1.8V (1.65V to 1.95V) + or 2.8V (2.5V to 3.1V) */ +}; +#define S5K6AA_NUM_SUPPLIES ARRAY_SIZE(s5k6aa_supply_names) + +enum s5k6aa_gpio_id { + STBY, + RST, + GPIO_NUM, +}; + +struct s5k6aa_regval { + u16 addr; + u16 val; +}; + +struct s5k6aa_pixfmt { + enum v4l2_mbus_pixelcode code; + u32 colorspace; + /* REG_P_FMT(x) register value */ + u16 reg_p_fmt; +}; + +struct s5k6aa_preset { + struct v4l2_frmsize_discrete out_size; + struct v4l2_rect in_win; + const struct s5k6aa_pixfmt *pixfmt; + unsigned int inv_hflip:1; + unsigned int inv_vflip:1; + u8 frame_rate_type; + u8 index; +}; + +/* Not all controls supported by the driver are in this struct. */ +struct s5k6aa_ctrls { + struct v4l2_ctrl_handler handler; + /* Mirror cluster */ + struct v4l2_ctrl *hflip; + struct v4l2_ctrl *vflip; + /* Auto exposure / manual exposure and gain cluster */ + struct v4l2_ctrl *auto_exp; + struct v4l2_ctrl *exposure; + struct v4l2_ctrl *gain; +}; + +struct s5k6aa_interval { + u16 reg_fr_time; + struct v4l2_fract interval; + /* Maximum rectangle for the interval */ + struct v4l2_frmsize_discrete size; +}; + +struct s5k6aa { + struct v4l2_subdev sd; + struct media_pad pad; + + enum v4l2_mbus_type bus_type; + u8 mipi_lanes; + + int (*s_power)(int enable); + struct regulator_bulk_data supplies[S5K6AA_NUM_SUPPLIES]; + struct s5k6aa_gpio gpio[GPIO_NUM]; + + /* master clock frequency */ + unsigned long mclk_frequency; + u16 clk_fop; + u16 clk_fmin; + u16 clk_fmax; + + /* protects the struct members below */ + struct mutex lock; + + struct s5k6aa_ctrls ctrls; + struct s5k6aa_preset presets[S5K6AA_MAX_PRESETS]; + struct s5k6aa_preset *preset; + const struct s5k6aa_interval *fiv; + + unsigned int streaming:1; + unsigned int apply_new_cfg:1; + unsigned int power; +}; + +static struct s5k6aa_regval s5k6aa_analog_config[] = { + /* Analog settings */ + { 0x112A, 0x0000 }, { 0x1132, 0x0000 }, + { 0x113E, 0x0000 }, { 0x115C, 0x0000 }, + { 0x1164, 0x0000 }, { 0x1174, 0x0000 }, + { 0x1178, 0x0000 }, { 0x077A, 0x0000 }, + { 0x077C, 0x0000 }, { 0x077E, 0x0000 }, + { 0x0780, 0x0000 }, { 0x0782, 0x0000 }, + { 0x0784, 0x0000 }, { 0x0786, 0x0000 }, + { 0x0788, 0x0000 }, { 0x07A2, 0x0000 }, + { 0x07A4, 0x0000 }, { 0x07A6, 0x0000 }, + { 0x07A8, 0x0000 }, { 0x07B6, 0x0000 }, + { 0x07B8, 0x0002 }, { 0x07BA, 0x0004 }, + { 0x07BC, 0x0004 }, { 0x07BE, 0x0005 }, + { 0x07C0, 0x0005 }, { S5K6AA_TERM, 0 }, +}; + +/* TODO: Add RGB888 and Bayer format */ +static const struct s5k6aa_pixfmt s5k6aa_formats[] = { + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 }, + /* range 16-240 */ + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_REC709, 6 }, + { V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_JPEG, 0 }, +}; + +static const struct s5k6aa_interval s5k6aa_intervals[] = { + { 1000, {10000, 1000000}, {1280, 1024} }, /* 10 fps */ + { 666, {15000, 1000000}, {1280, 1024} }, /* 15 fps */ + { 500, {20000, 1000000}, {1280, 720} }, /* 20 fps */ + { 400, {25000, 1000000}, {640, 480} }, /* 25 fps */ + { 333, {33300, 1000000}, {640, 480} }, /* 30 fps */ +}; + +#define S5K6AA_INTERVAL_DEF_INDEX 1 /* 15 fps */ + +static struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl) +{ + return &container_of(ctrl->handler, struct s5k6aa, ctrls.handler)->sd; +} + +static struct s5k6aa *to_s5k6aa(struct v4l2_subdev *sd) +{ + return container_of(sd, struct s5k6aa, sd); +} + +/* Set initial values for all preview presets */ +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, + int hflip, int vflip) +{ + struct s5k6aa_preset *preset = &s5k6aa->presets[0]; + int i; + + for (i = 0; i < S5K6AA_MAX_PRESETS; i++) { + preset->pixfmt = &s5k6aa_formats[0]; + preset->frame_rate_type = FR_RATE_DYNAMIC; + preset->inv_hflip = hflip; + preset->inv_vflip = vflip; + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; + preset->in_win.left = 0; + preset->in_win.top = 0; + preset->index = i; + preset++; + } + + s5k6aa->fiv = &s5k6aa_intervals[S5K6AA_INTERVAL_DEF_INDEX]; + s5k6aa->preset = &s5k6aa->presets[0]; +} + +static int s5k6aa_i2c_read(struct i2c_client *client, u16 addr, u16 *val) +{ + u8 wbuf[2] = {addr >> 8, addr & 0xFF}; + struct i2c_msg msg[2]; + u8 rbuf[2]; + int ret; + + msg[0].addr = client->addr; + msg[0].flags = 0; + msg[0].len = 2; + msg[0].buf = wbuf; + + msg[1].addr = client->addr; + msg[1].flags = I2C_M_RD; + msg[1].len = 2; + msg[1].buf = rbuf; + + ret = i2c_transfer(client->adapter, msg, 2); + *val = be16_to_cpu(*((u16 *)rbuf)); + + v4l2_dbg(3, debug, client, "i2c_read: 0x%04X : 0x%04x\n", addr, *val); + + return ret == 2 ? 0 : ret; +} + +static int s5k6aa_i2c_write(struct i2c_client *client, u16 addr, u16 val) +{ + u8 buf[4] = {addr >> 8, addr & 0xFF, val >> 8, val & 0xFF}; + + int ret = i2c_master_send(client, buf, 4); + v4l2_dbg(3, debug, client, "i2c_write: 0x%04X : 0x%04x\n", addr, val); + + return ret == 4 ? 0 : ret; +} + +/* The command register write, assumes Command_Wr_addH = 0x7000. */ +static int s5k6aa_write(struct i2c_client *c, u16 addr, u16 val) +{ + int ret = s5k6aa_i2c_write(c, REG_CMDWR_ADDRL, addr); + if (ret) + return ret; + return s5k6aa_i2c_write(c, REG_CMDBUF0_ADDR, val); +} + +/* The command register read, assumes Command_Rd_addH = 0x7000. */ +static int s5k6aa_read(struct i2c_client *client, u16 addr, u16 *val) +{ + int ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRL, addr); + if (ret) + return ret; + return s5k6aa_i2c_read(client, REG_CMDBUF0_ADDR, val); +} + +static int s5k6aa_write_array(struct v4l2_subdev *sd, + const struct s5k6aa_regval *msg) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + u16 addr_incr = 0; + int ret = 0; + + while (msg->addr != S5K6AA_TERM) { + if (addr_incr != 2) + ret = s5k6aa_i2c_write(client, REG_CMDWR_ADDRL, + msg->addr); + if (ret) + break; + ret = s5k6aa_i2c_write(client, REG_CMDBUF0_ADDR, msg->val); + if (ret) + break; + /* Assume that msg->addr is always less than 0xfffc */ + addr_incr = (msg + 1)->addr - msg->addr; + msg++; + } + + return ret; +} + +/* Configure the AHB high address bytes for GTG registers access */ +static int s5k6aa_set_ahb_address(struct i2c_client *client) +{ + int ret = s5k6aa_i2c_write(client, AHB_MSB_ADDR_PTR, GEN_REG_OFFSH); + if (ret) + return ret; + ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRH, HOST_SWIF_OFFSH); + if (ret) + return ret; + return s5k6aa_i2c_write(client, REG_CMDWR_ADDRH, HOST_SWIF_OFFSH); +} + +/** + * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration + * + * Configure the internal ISP PLL for 24 MHz output frequency. + * Locking: called with s5k6aa->lock mutex held. + */ +static int s5k6aa_configure_pixel_clock(struct s5k6aa *s5k6aa) +{ + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); + unsigned long fmclk = s5k6aa->mclk_frequency / 1000; + int ret; + + if (WARN(fmclk < MIN_MCLK_FREQ_KHZ || fmclk > MAX_MCLK_FREQ_KHZ, + "Invalid clock frequency: %ld\n", fmclk)) + return -EINVAL; + + s5k6aa->clk_fop = 24000000U / 4000U; + s5k6aa->clk_fmin = 48000000U / 4000U; + s5k6aa->clk_fmax = 56000000U / 4000U; + + /* External input clock frequency in kHz */ + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_H, fmclk >> 16); + if (!ret) + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_L, fmclk & 0xFFFF); + if (!ret) + ret = s5k6aa_write(c, REG_I_USE_NPVI_CLOCKS, 1); + /* Internal PLL frequency */ + if (!ret) + ret = s5k6aa_write(c, REG_I_OPCLK_4KHZ(0), s5k6aa->clk_fop); + if (!ret) + ret = s5k6aa_write(c, REG_I_MIN_OUTRATE_4KHZ(0), + s5k6aa->clk_fmin); + if (!ret) + ret = s5k6aa_write(c, REG_I_MAX_OUTRATE_4KHZ(0), + s5k6aa->clk_fmax); + return ret ? ret : s5k6aa_write(c, REG_I_INIT_PARAMS_UPDATED, 1); +} + +/* Set horizontal and vertical image flipping */ +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + struct s5k6aa_preset *preset = s5k6aa->preset; + + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; + unsigned int hflip = horiz_flip ^ preset->inv_hflip; + + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), + hflip | (vflip << 1)); +} + +/* Program FW with exposure time, 'exposure' in us units */ +static int s5k6aa_set_user_exposure(struct i2c_client *client, int exposure) +{ + unsigned int time = exposure / 10; + + int ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_L, time & 0xffff); + if (!ret) + ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_H, time >> 16); + if (ret) + return ret; + return s5k6aa_write(client, REG_SF_USR_EXPOSURE_CHG, 1); +} + +static int s5k6aa_set_user_gain(struct i2c_client *client, int gain) +{ + int ret = s5k6aa_write(client, REG_SF_USR_TOT_GAIN, gain); + if (ret) + return ret; + return s5k6aa_write(client, REG_SF_USR_TOT_GAIN_CHG, 1); +} + +/* Set auto/manual exposure and total gain */ +static int s5k6aa_set_auto_exposure(struct s5k6aa *s5k6aa, int value) +{ + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); + unsigned int exp_time = s5k6aa->ctrls.exposure->val; + u16 auto_alg; + + int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &auto_alg); + if (ret) + return ret; + + v4l2_dbg(1, debug, c, "man_exp: %d, auto_exp: %d, a_alg: 0x%x\n", + exp_time, value, auto_alg); + + if (value == V4L2_EXPOSURE_AUTO) { + auto_alg |= AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK; + } else { + ret = s5k6aa_set_user_exposure(c, exp_time); + if (ret) + return ret; + ret = s5k6aa_set_user_gain(c, s5k6aa->ctrls.gain->val); + if (ret) + return ret; + auto_alg &= ~(AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK); + } + + return s5k6aa_write(c, REG_DBG_AUTOALG_EN, auto_alg); +} + +static int s5k6aa_set_anti_flicker(struct s5k6aa *s5k6aa, int value) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + u16 auto_alg; + int ret; + + ret = s5k6aa_read(client, REG_DBG_AUTOALG_EN, &auto_alg); + if (ret) + return ret; + + if (value == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) { + auto_alg |= AALG_FLICKER_EN_MASK; + } else { + auto_alg &= ~AALG_FLICKER_EN_MASK; + /* The V4L2_CID_LINE_FREQUENCY control values are + * suitable for writing directly to this register */ + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT, value); + if (ret) + return ret; + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT_CHG, 1); + if (ret) + return ret; + } + + return s5k6aa_write(client, REG_DBG_AUTOALG_EN, auto_alg); +} + +static int s5k6aa_set_colorfx(struct s5k6aa *s5k6aa, int val) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + static const struct v4l2_control colorfx[] = { + { V4L2_COLORFX_NONE, 0 }, + { V4L2_COLORFX_BW, 1 }, + { V4L2_COLORFX_NEGATIVE, 2 }, + { V4L2_COLORFX_SEPIA, 3 }, + { V4L2_COLORFX_SKY_BLUE, 4 }, + { V4L2_COLORFX_SKETCH, 5 }, + }; + int i; + + for (i = 0; i < ARRAY_SIZE(colorfx); i++) { + if (colorfx[i].id == val) + return s5k6aa_write(client, REG_G_SPEC_EFFECTS, + colorfx[i].value); + } + return -EINVAL; +} + +static int s5k6aa_get_preview_cfg_status(struct i2c_client *client) +{ + u16 error = 0; + int ret = s5k6aa_read(client, REG_G_PREV_CFG_ERROR, &error); + + v4l2_dbg(1, debug, client, "error: 0x%x (%d)\n", error, ret); + return ret ? ret : (error == 0 ? 0 : -EINVAL); +} + +static int s5k6aa_set_output_framefmt(struct s5k6aa *s5k6aa, + struct s5k6aa_preset *preset, bool apply) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + int ret; + + if (WARN_ON(preset->pixfmt == NULL)) + return -EINVAL; + + ret = s5k6aa_write(client, REG_P_OUT_WIDTH(preset->index), + preset->out_size.width); + if (!ret) + ret = s5k6aa_write(client, REG_P_OUT_HEIGHT(preset->index), + preset->out_size.height); + if (!ret) + ret = s5k6aa_write(client, REG_P_FMT(preset->index), + preset->pixfmt->reg_p_fmt); + if (!ret && apply) { + ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); + if (!ret) + ret = s5k6aa_get_preview_cfg_status(client); + } + + return ret; +} + +/** + * s5k6aa_configure_video_bus - configure the video output interface + * @bus_type: video bus type: parallel or MIPI-CSI + * @nlanes: number of MIPI lanes to be used (MIPI-CSI only) + * + * Note: Only parallel bus operation has been tested. + */ +static int s5k6aa_configure_video_bus(struct s5k6aa *s5k6aa, + enum v4l2_mbus_type bus_type, int nlanes) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + u16 cfg = 0; + int ret; + + /* + * TODO: The sensor is supposed to support BT.601 and BT.656 + * but there is nothing indicating how to switch between both + * in the datasheet. For now default BT.601 interface is assumed. + */ + if (bus_type == V4L2_MBUS_CSI2) + cfg = nlanes; + else if (bus_type != V4L2_MBUS_PARALLEL) + return -EINVAL; + + ret = s5k6aa_write(client, REG_OIF_EN_MIPI_LANES, cfg); + if (ret) + return ret; + return s5k6aa_write(client, REG_OIF_CFG_CHG, 1); +} + +static int s5k6aa_sync_preview_preset(struct i2c_client *client, int timeout) +{ + unsigned long end = jiffies + msecs_to_jiffies(timeout); + u16 reg = 1; + + int ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); + if (!ret) + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); + if (timeout == 0) + return ret; + + while (ret >= 0 && time_is_after_jiffies(end)) { + ret = s5k6aa_read(client, REG_G_NEW_CFG_SYNC, ®); + if (!reg) + return 0; + usleep_range(1000, 5000); + } + return ret ? ret : -ETIMEDOUT; +} + +/** + * s5k6aa_set_preview_preset - write user preview register set + * + * Configure pixel clock frequency range, device frame rate type + * and frame period range. + */ +static int s5k6aa_set_preview_preset(struct s5k6aa *s5k6aa, + struct s5k6aa_preset *preset) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + int idx = preset->index; + u16 frame_rate_q; + int ret; + + if (s5k6aa->fiv->reg_fr_time >= S5K6AA_MAX_HIGH_RES_FR_TIME) + frame_rate_q = FR_RATE_Q_BEST_FRRATE; + else + frame_rate_q = FR_RATE_Q_BEST_QUALITY; + + ret = s5k6aa_set_output_framefmt(s5k6aa, preset, true); + if (!ret) + ret = s5k6aa_write(client, REG_P_MAX_OUT_RATE(idx), + S5K6AA_MAX_PCLK_FREQ); + if (!ret) + ret = s5k6aa_write(client, REG_P_MIN_OUT_RATE(idx), + S5K6AA_MIN_PCLK_FREQ); + if (!ret) + ret = s5k6aa_write(client, REG_P_FR_RATE_TYPE(idx), + preset->frame_rate_type); + if (!ret) + ret = s5k6aa_write(client, REG_P_FR_RATE_Q_TYPE(idx), + frame_rate_q); + if (!ret) + ret = s5k6aa_write(client, REG_P_MAX_FR_TIME(idx), + s5k6aa->fiv->reg_fr_time + 15); + if (!ret) + ret = s5k6aa_write(client, REG_P_MIN_FR_TIME(idx), + s5k6aa->fiv->reg_fr_time - 15); + if (!ret) + ret = s5k6aa_sync_preview_preset(client, 0); + + if (!ret) { + ret = s5k6aa_get_preview_cfg_status(client); + s5k6aa->apply_new_cfg = 0; + } + + v4l2_dbg(1, debug, client, "frame interval: %d +/- 1.5ms. (%d)\n", + s5k6aa->fiv->reg_fr_time, ret); + return ret; +} + +/** + * s5k6aa_initialize_isp - basic ISP MCU initialization + * + * Configure AHB addresses for registers read/write; configure PLLs for + * required output pixel clock. The ISP power supply needs to be already + * enabled, with an optional H/W reset. + * Locking: called with s5k6aa.lock mutex held. + */ +static int s5k6aa_initialize_isp(struct v4l2_subdev *sd) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int ret; + + s5k6aa->apply_new_cfg = 1; + + ret = s5k6aa_set_ahb_address(client); + if (ret) + return ret; + ret = s5k6aa_configure_video_bus(s5k6aa, s5k6aa->bus_type, + s5k6aa->mipi_lanes); + if (ret) + return ret; + ret = s5k6aa_write_array(sd, s5k6aa_analog_config); + if (ret) + return ret; + msleep(100); + + return s5k6aa_configure_pixel_clock(s5k6aa); +} + +static int s5k6aa_gpio_set_value(struct s5k6aa *priv, int id, u32 val) +{ + if (!gpio_is_valid(priv->gpio[id].gpio)) + return 0; + gpio_set_value(priv->gpio[id].gpio, !!val); + return 1; +} + +static int s5k6aa_gpio_assert(struct s5k6aa *priv, int id) +{ + return s5k6aa_gpio_set_value(priv, id, priv->gpio[id].level); +} + +static int s5k6aa_gpio_deassert(struct s5k6aa *priv, int id) +{ + return s5k6aa_gpio_set_value(priv, id, !priv->gpio[id].level); +} + +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) +{ + int ret; + + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); + if (ret) + return ret; + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) + udelay(200); + + if (s5k6aa->s_power) + ret = s5k6aa->s_power(1); + usleep_range(4000, 4000); + + if (s5k6aa_gpio_deassert(s5k6aa, RST)) + msleep(20); + + return ret; +} + +static int __s5k6aa_power_disable(struct s5k6aa *s5k6aa) +{ + int ret; + + if (s5k6aa_gpio_assert(s5k6aa, RST)) + udelay(100); + + if (s5k6aa->s_power) { + ret = s5k6aa->s_power(0); + if (ret) + return ret; + } + if (s5k6aa_gpio_assert(s5k6aa, STBY)) + udelay(50); + + return regulator_bulk_disable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); +} + +/* + * V4L2 subdev core and video operations + */ +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int ret = 0; + + mutex_lock(&s5k6aa->lock); + + if (!on == s5k6aa->power) { + if (on) { + ret = __s5k6aa_power_enable(s5k6aa); + if (!ret) + ret = s5k6aa_initialize_isp(sd); + } else { + ret = __s5k6aa_power_disable(s5k6aa); + } + } + if (!ret && !WARN_ON(s5k6aa->power < 0)) + s5k6aa->power += on ? 1 : -1; + mutex_unlock(&s5k6aa->lock); + + if (!ret && on && s5k6aa->power == 1) + return v4l2_ctrl_handler_setup(sd->ctrl_handler); + + return ret; +} + +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + int ret; + + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); + if (!ret) + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); + if (!ret) + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); + if (!ret) + s5k6aa->streaming = enable; + + return ret; +} + +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int ret = 0; + + mutex_lock(&s5k6aa->lock); + + if (!s5k6aa->streaming == !on) { + mutex_unlock(&s5k6aa->lock); + return 0; + } + if (s5k6aa->apply_new_cfg) + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); + if (!ret) + ret = __s5k6aa_stream(s5k6aa, !!on); + + mutex_unlock(&s5k6aa->lock); + return ret; +} + +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, + struct v4l2_subdev_frame_interval *fi) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + + memset(fi->reserved, 0, sizeof(fi->reserved)); + + mutex_lock(&s5k6aa->lock); + fi->interval = s5k6aa->fiv->interval; + mutex_unlock(&s5k6aa->lock); + + return 0; +} + +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, + struct v4l2_subdev_frame_interval *fi) +{ + struct v4l2_frmsize_discrete *out_win = &s5k6aa->preset->out_size; + const struct s5k6aa_interval *fiv = &s5k6aa_intervals[0]; + unsigned int err, min_err = UINT_MAX; + unsigned int i, fr_time; + + if (fi->interval.denominator == 0) + return -EINVAL; + + memset(fi->reserved, 0, sizeof(fi->reserved)); + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; + + for (i = 0; i < ARRAY_SIZE(s5k6aa_intervals); i++) { + const struct s5k6aa_interval *iv = &s5k6aa_intervals[i]; + + if (out_win->width > iv->size.width || + out_win->height > iv->size.height) + continue; + + err = abs(iv->reg_fr_time - fr_time); + if (err < min_err) { + fiv = iv; + min_err = err; + } + } + s5k6aa->fiv = fiv; + + v4l2_dbg(1, debug, &s5k6aa->sd, "Changed frame interval to %d us\n", + fiv->reg_fr_time * 100); + return 0; +} + +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, + struct v4l2_subdev_frame_interval *fi) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int ret; + + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", + fi->interval.numerator, fi->interval.denominator); + + mutex_lock(&s5k6aa->lock); + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); + s5k6aa->apply_new_cfg = 1; + + mutex_unlock(&s5k6aa->lock); + return ret; +} + +/* + * V4L2 subdev pad level operations + */ +static int s5k6aa_enum_frame_interval(struct v4l2_subdev *sd, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_frame_interval_enum *fie) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + const struct s5k6aa_interval *fi; + int ret = 0; + + if (fie->index > ARRAY_SIZE(s5k6aa_intervals)) + return -EINVAL; + + memset(fie->reserved, 0, sizeof(fie->reserved)); + + v4l_bound_align_image(&fie->width, S5K6AA_WIN_WIDTH_MIN, + S5K6AA_WIN_WIDTH_MAX, 1, + &fie->height, S5K6AA_WIN_HEIGHT_MIN, + S5K6AA_WIN_HEIGHT_MAX, 1, 0); + + mutex_lock(&s5k6aa->lock); + fi = &s5k6aa_intervals[fie->index]; + if (fie->width > fi->size.width || fie->height > fi->size.height) + ret = -EINVAL; + else + fie->interval = fi->interval; + mutex_unlock(&s5k6aa->lock); + + return ret; +} + +static int s5k6aa_enum_mbus_code(struct v4l2_subdev *sd, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_mbus_code_enum *code) +{ + if (code->index >= ARRAY_SIZE(s5k6aa_formats)) + return -EINVAL; + + code->code = s5k6aa_formats[code->index].code; + return 0; +} + +static int s5k6aa_enum_frame_size(struct v4l2_subdev *sd, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_frame_size_enum *fse) +{ + int i = ARRAY_SIZE(s5k6aa_formats); + + if (fse->index > 0) + return -EINVAL; + + while (--i) + if (fse->code == s5k6aa_formats[i].code) + break; + + fse->code = s5k6aa_formats[i].code; + memset(fse->reserved, 0, sizeof(fse->reserved)); + + fse->min_width = S5K6AA_WIN_WIDTH_MIN; + fse->max_width = S5K6AA_WIN_WIDTH_MAX; + fse->max_height = S5K6AA_WIN_HEIGHT_MIN; + fse->min_height = S5K6AA_WIN_HEIGHT_MAX; + + return 0; +} + +static const struct s5k6aa_pixfmt *s5k6aa_try_format(struct s5k6aa *s5k6aa, + struct v4l2_mbus_framefmt *mf) +{ + int i; + + v4l_bound_align_image(&mf->width, S5K6AA_WIN_WIDTH_MIN, + S5K6AA_WIN_WIDTH_MAX, 1, + &mf->height, S5K6AA_WIN_HEIGHT_MIN, + S5K6AA_WIN_HEIGHT_MAX, 1, 0); + + if (mf->colorspace != V4L2_COLORSPACE_JPEG && + mf->colorspace != V4L2_COLORSPACE_REC709) + mf->colorspace = V4L2_COLORSPACE_JPEG; + + for (i = 0; i < ARRAY_SIZE(s5k6aa_formats); i++) { + if (mf->colorspace == s5k6aa_formats[i].colorspace && + mf->code == s5k6aa_formats[i].code) + return &s5k6aa_formats[i]; + } + mf->colorspace = s5k6aa_formats[0].colorspace; + mf->code = s5k6aa_formats[0].code; + + return &s5k6aa_formats[0]; +} + +static int s5k6aa_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, + struct v4l2_subdev_format *fmt) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + struct s5k6aa_preset *preset = s5k6aa->preset; + struct s5k6aa_pixfmt const *pixfmt; + struct v4l2_mbus_framefmt *mf; + int ret = 0; + + pixfmt = s5k6aa_try_format(s5k6aa, &fmt->format); + + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { + if (fh) { + mf = v4l2_subdev_get_try_format(fh, fmt->pad); + *mf = fmt->format; + } + return 0; + } + memset(fmt->reserved, 0, sizeof(fmt->reserved)); + + mutex_lock(&s5k6aa->lock); + mf = &fmt->format; + if (!s5k6aa->streaming) { + preset->pixfmt = pixfmt; + preset->out_size.width = mf->width; + preset->out_size.height = mf->height; + s5k6aa->apply_new_cfg = 1; + } else { + ret = -EBUSY; + } + + v4l2_dbg(1, debug, sd, "Resolution: %dx%d (%d)\n", + mf->width, mf->height, s5k6aa->streaming); + + /* Reset to minimum possible frame interval */ + if (!ret) { + struct v4l2_subdev_frame_interval fiv = { + .interval = {0, 1} + }; + ret = __s5k6aa_set_frame_interval(s5k6aa, &fiv); + } + + mutex_unlock(&s5k6aa->lock); + return ret; +} + +static void s5k6aa_get_preset_fmt(struct s5k6aa_preset *preset, + struct v4l2_mbus_framefmt *mf) +{ + mf->colorspace = preset->pixfmt->colorspace; + mf->code = preset->pixfmt->code; + mf->field = V4L2_FIELD_NONE; + mf->width = preset->out_size.width; + mf->height = preset->out_size.height; +} + +static int s5k6aa_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, + struct v4l2_subdev_format *fmt) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { + if (fh) { + struct v4l2_mbus_framefmt *mf; + mf = v4l2_subdev_get_try_format(fh, 0); + fmt->format = *mf; + } + return 0; + } + memset(fmt->reserved, 0, sizeof(fmt->reserved)); + + mutex_lock(&s5k6aa->lock); + s5k6aa_get_preset_fmt(s5k6aa->preset, &fmt->format); + mutex_unlock(&s5k6aa->lock); + return 0; +} + +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { + .enum_mbus_code = s5k6aa_enum_mbus_code, + .enum_frame_size = s5k6aa_enum_frame_size, + .enum_frame_interval = s5k6aa_enum_frame_interval, + .get_fmt = s5k6aa_get_fmt, + .set_fmt = s5k6aa_set_fmt, +}; + +/* + * V4L2 subdev control operations + */ +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) +{ + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); + struct i2c_client *c = v4l2_get_subdevdata(sd); + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int pid, err = 0; + + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", + __func__, ctrl->id, ctrl->val); + + mutex_lock(&s5k6aa->lock); + /* + * If the device is not powered up by the host driver do + * not apply any controls to H/W at this time. Instead + * the controls will be restored right after power-up. + */ + if (s5k6aa->power == 0) + goto unlock; + pid = s5k6aa->preset->index; + + switch (ctrl->id) { + case V4L2_CID_BRIGHTNESS: + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); + break; + + case V4L2_CID_COLORFX: + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); + break; + + case V4L2_CID_CONTRAST: + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); + break; + + case V4L2_CID_EXPOSURE_AUTO: + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); + break; + + case V4L2_CID_HFLIP: + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); + break; + + case V4L2_CID_POWER_LINE_FREQUENCY: + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); + break; + + case V4L2_CID_SATURATION: + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); + break; + + case V4L2_CID_SHARPNESS: + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); + break; + + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); + break; + } + /* This should be really called once per all controls update + rather than per each control. */ + if (!err) + err = s5k6aa_sync_preview_preset(c, 0); +unlock: + mutex_unlock(&s5k6aa->lock); + return err; +} + +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { + .s_ctrl = s5k6aa_s_ctrl, +}; + +static int s5k6aa_log_status(struct v4l2_subdev *sd) +{ + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); + return 0; +} + +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { + .g_frame_interval = s5k6aa_g_frame_interval, + .s_frame_interval = s5k6aa_s_frame_interval, + .s_stream = s5k6aa_s_stream, +}; + +/* + * V4L2 subdev internal operations + */ +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) +{ + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); + + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); + return 0; +} + +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) +{ + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); + u16 api_ver = 0, fw_rev = 0; + + int ret = s5k6aa_set_ahb_address(client); + + if (!ret) + ret = s5k6aa_read(client, REG_FW_APIVER, &api_ver); + if (!ret) + ret = s5k6aa_read(client, REG_FW_REVISION, &fw_rev); + if (ret) { + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); + return ret; + } + + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", + api_ver, fw_rev); + + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; +} + +static int s5k6aa_registered(struct v4l2_subdev *sd) +{ + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + int ret; + + mutex_lock(&s5k6aa->lock); + ret = __s5k6aa_power_enable(s5k6aa); + if (!ret) { + msleep(100); + ret = s5k6aa_check_fw_revision(s5k6aa); + __s5k6aa_power_disable(s5k6aa); + } + mutex_unlock(&s5k6aa->lock); + + return ret; +} + +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { + .registered = s5k6aa_registered, + .open = s5k6aa_open, +}; + +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { + .s_power = s5k6aa_set_power, + .g_ctrl = v4l2_subdev_g_ctrl, + .s_ctrl = v4l2_subdev_s_ctrl, + .queryctrl = v4l2_subdev_queryctrl, + .querymenu = v4l2_subdev_querymenu, + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, + .log_status = s5k6aa_log_status, +}; + +static const struct v4l2_subdev_ops s5k6aa_subdev_ops = { + .core = &s5k6aa_core_ops, + .pad = &s5k6aa_pad_ops, + .video = &s5k6aa_video_ops, +}; + +static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa) +{ + const struct v4l2_ctrl_ops *ops = &s5k6aa_ctrl_ops; + struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls; + struct v4l2_ctrl_handler *hdl = &ctrls->handler; + + int ret = v4l2_ctrl_handler_init(hdl, 12); + if (ret) + return ret; + + ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0); + ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0); + v4l2_ctrl_cluster(2, &ctrls->hflip); + + ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops, + V4L2_CID_EXPOSURE_AUTO, + V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); + /* Exposure time: x 1 us */ + ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE, + 0, 6000000U, 1, 100000U); + /* Total gain: 256 <=> 1x */ + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, + 0, 256, 1, 256); + v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 0, false); + + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY, + V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0, + V4L2_CID_POWER_LINE_FREQUENCY_AUTO); + + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX, + V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE); + + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE, + 0, 256, 1, 0); + + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0); + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0); + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0); + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0); + + if (hdl->error) { + ret = hdl->error; + v4l2_ctrl_handler_free(hdl); + return ret; + } + + s5k6aa->sd.ctrl_handler = hdl; + return 0; +} + +/* + * GPIO setup + */ +static int s5k6aa_configure_gpio(int nr, int val, const char *name) +{ + unsigned long flags = val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW; + int ret; + + if (!gpio_is_valid(nr)) + return 0; + ret = gpio_request_one(nr, flags, name); + if (!ret) + gpio_export(nr, 0); + return ret; +} + +static void s5k6aa_free_gpios(struct s5k6aa *s5k6aa) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(s5k6aa->gpio); i++) { + if (!gpio_is_valid(s5k6aa->gpio[i].gpio)) + continue; + gpio_free(s5k6aa->gpio[i].gpio); + s5k6aa->gpio[i].gpio = -EINVAL; + } +} + +static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa, + const struct s5k6aa_platform_data *pdata) +{ + const struct s5k6aa_gpio *gpio = &pdata->gpio_stby; + int ret; + + s5k6aa->gpio[STBY].gpio = -EINVAL; + s5k6aa->gpio[RST].gpio = -EINVAL; + + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_STBY"); + if (ret) { + s5k6aa_free_gpios(s5k6aa); + return ret; + } + s5k6aa->gpio[STBY] = *gpio; + if (gpio_is_valid(gpio->gpio)) + gpio_set_value(gpio->gpio, 0); + + gpio = &pdata->gpio_reset; + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_RST"); + if (ret) { + s5k6aa_free_gpios(s5k6aa); + return ret; + } + s5k6aa->gpio[RST] = *gpio; + if (gpio_is_valid(gpio->gpio)) + gpio_set_value(gpio->gpio, 0); + + return 0; +} + +static int s5k6aa_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + const struct s5k6aa_platform_data *pdata = client->dev.platform_data; + struct v4l2_subdev *sd; + struct s5k6aa *s5k6aa; + int i, ret; + + if (pdata == NULL) { + dev_err(&client->dev, "Platform data not specified\n"); + return -EINVAL; + } + + if (pdata->mclk_frequency == 0) { + dev_err(&client->dev, "MCLK frequency not specified\n"); + return -EINVAL; + } + + s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); + if (!s5k6aa) + return -ENOMEM; + + mutex_init(&s5k6aa->lock); + s5k6aa->mclk_frequency = pdata->mclk_frequency; + s5k6aa->bus_type = pdata->bus_type; + s5k6aa->mipi_lanes = pdata->nlanes; + s5k6aa->s_power = pdata->set_power; + + sd = &s5k6aa->sd; + strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name)); + v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops); + + sd->internal_ops = &s5k6aa_subdev_internal_ops; + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + + s5k6aa->pad.flags = MEDIA_PAD_FL_SOURCE; + sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; + ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); + if (ret) + goto out_err1; + + ret = s5k6aa_configure_gpios(s5k6aa, pdata); + if (ret) + goto out_err2; + + for (i = 0; i < S5K6AA_NUM_SUPPLIES; i++) + s5k6aa->supplies[i].supply = s5k6aa_supply_names[i]; + + ret = regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES, + s5k6aa->supplies); + if (ret) { + dev_err(&client->dev, "Failed to get regulators\n"); + goto out_err2; + } + + ret = s5k6aa_initialize_ctrls(s5k6aa); + if (ret) + goto out_err3; + + s5k6aa_presets_data_init(s5k6aa, pdata->horiz_flip, + pdata->vert_flip); + return 0; + +out_err3: + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); +out_err2: + media_entity_cleanup(&s5k6aa->sd.entity); +out_err1: + kfree(s5k6aa); + return ret; +} + +static int s5k6aa_remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct s5k6aa *s5k6aa = to_s5k6aa(sd); + + v4l2_device_unregister_subdev(sd); + v4l2_ctrl_handler_free(sd->ctrl_handler); + media_entity_cleanup(&sd->entity); + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); + s5k6aa_free_gpios(s5k6aa); + kfree(s5k6aa); + + return 0; +} + +static const struct i2c_device_id s5k6aa_id[] = { + { DRIVER_NAME, 0 }, + { }, +}; +MODULE_DEVICE_TABLE(i2c, s5k6aa_id); + + +static struct i2c_driver s5k6aa_i2c_driver = { + .driver = { + .name = DRIVER_NAME + }, + .probe = s5k6aa_probe, + .remove = s5k6aa_remove, + .id_table = s5k6aa_id, +}; + +static int __init s5k6aa_init(void) +{ + return i2c_add_driver(&s5k6aa_i2c_driver); +} + +static void __exit s5k6aa_exit(void) +{ + i2c_del_driver(&s5k6aa_i2c_driver); +} + +module_init(s5k6aa_init); +module_exit(s5k6aa_exit); + +MODULE_DESCRIPTION("Samsung S5K6AA(FX) SXGA camera driver"); +MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>"); +MODULE_LICENSE("GPL"); diff --git a/include/media/s5k6aa.h b/include/media/s5k6aa.h new file mode 100644 index 0000000..a7c3dd4 --- /dev/null +++ b/include/media/s5k6aa.h @@ -0,0 +1,51 @@ +/* + * S5K6AAFX camera sensor driver header + * + * Copyright (C) 2011 Samsung Electronics Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef S5K6AA_H +#define S5K6AA_H + +#include <media/v4l2-mediabus.h> + +/** + * struct s5k6aa_gpio - data structure describing a GPIO + * @gpio: GPIO number + * @level: indicates active state of the @gpio + */ +struct s5k6aa_gpio { + int gpio; + int level; +}; + +/** + * struct s5k6aa_platform_data - s5k6aa driver platform data + * @set_power: an additional callback to the board code, called + * after enabling the regulators and before switching + * the sensor off + * @mclk_frequency: sensor's master clock frequency in Hz + * @gpio_nreset: GPIO driving RESET pin + * @gpio_nstby: GPIO driving STBY pin + * @nlanes: maximum number of MIPI-CSI lanes used + * @horiz_flip: default horizontal image flip value, non zero to enable + * @vert_flip: default vertical image flip value, non zero to enable + */ + +struct s5k6aa_platform_data { + int (*set_power)(int enable); + unsigned long mclk_frequency; + struct s5k6aa_gpio gpio_reset; + struct s5k6aa_gpio gpio_stby; + enum v4l2_mbus_type bus_type; + u8 nlanes; + u8 horiz_flip; + u8 vert_flip; +}; + +#endif /* S5K6AA_H */ -- 1.7.6.3 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-21 17:45 ` [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki @ 2011-09-22 22:02 ` Sakari Ailus 2011-09-23 10:12 ` Sylwester Nawrocki 2011-09-26 13:21 ` Hans Verkuil 1 sibling, 1 reply; 19+ messages in thread From: Sakari Ailus @ 2011-09-22 22:02 UTC (permalink / raw) To: Sylwester Nawrocki Cc: linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Hi Sylwester, I have a few additional comments below, they don't depend on my earlier ones. On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: > This driver exposes preview mode operation of the S5K6AAFX sensor with > embedded SoC ISP. It uses one of the five user predefined configuration > register sets. There is yet no support for capture (snapshot) operation. > Following controls are supported: > manual/auto exposure and gain, power line frequency (anti-flicker), > saturation, sharpness, brightness, contrast, white balance temperature, > color effects, horizontal/vertical image flip, frame interval. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/media/video/Kconfig | 7 + > drivers/media/video/Makefile | 1 + > drivers/media/video/s5k6aa.c | 1482 ++++++++++++++++++++++++++++++++++++++++++ > include/media/s5k6aa.h | 51 ++ > 4 files changed, 1541 insertions(+), 0 deletions(-) > create mode 100644 drivers/media/video/s5k6aa.c > create mode 100644 include/media/s5k6aa.h > > diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig > index 9da6044..ccc8172 100644 > --- a/drivers/media/video/Kconfig > +++ b/drivers/media/video/Kconfig > @@ -496,6 +496,13 @@ config VIDEO_TCM825X > This is a driver for the Toshiba TCM825x VGA camera sensor. > It is used for example in Nokia N800. > > +config VIDEO_S5K6AA > + tristate "Samsung S5K6AAFX sensor support" > + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > + ---help--- > + This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M > + camera sensor with an embedded SoC image signal processor. > + > comment "Flash devices" > > config VIDEO_ADP1653 > diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile > index f52a771..526cb32 100644 > --- a/drivers/media/video/Makefile > +++ b/drivers/media/video/Makefile > @@ -71,6 +71,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o > obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o > obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o > obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ > +obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o > obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o > > obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o > diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c > new file mode 100644 > index 0000000..43b7dac > --- /dev/null > +++ b/drivers/media/video/s5k6aa.c > @@ -0,0 +1,1482 @@ > +/* > + * Driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor > + * with embedded SoC ISP. > + * > + * Copyright (C) 2011, Samsung Electronics Co., Ltd. > + * Author: Sylwester Nawrocki <s.nawrocki@samsung.com> > + * > + * Based on a driver authored by Dongsoo Nathaniel Kim. > + * Copyright (C) 2009, Dongsoo Nathaniel Kim <dongsoo45.kim@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * TODO: > + * - add set/get_crop operations > + * - add capture (snapshot) mode support > + */ > + > +#include <linux/clk.h> > +#include <linux/delay.h> > +#include <linux/gpio.h> > +#include <linux/i2c.h> > +#include <linux/media.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > + > +#include <media/media-entity.h> > +#include <media/v4l2-ctrls.h> > +#include <media/v4l2-device.h> > +#include <media/v4l2-subdev.h> > +#include <media/v4l2-mediabus.h> > +#include <media/s5k6aa.h> > + > +static int debug; > +module_param(debug, int, 0644); > + > +#define DRIVER_NAME "S5K6AA" > + > +/* The token to indicate array termination */ > +#define S5K6AA_TERM 0xffff > +#define S5K6AA_OUT_WIDTH_DEF 640 > +#define S5K6AA_OUT_HEIGHT_DEF 480 > +#define S5K6AA_WIN_WIDTH_MAX 1280 > +#define S5K6AA_WIN_HEIGHT_MAX 1024 > +#define S5K6AA_WIN_WIDTH_MIN 8 > +#define S5K6AA_WIN_HEIGHT_MIN 8 > + > +/* > + * H/W register Interface (0xD0000000 - 0xD0000FFF) > + */ > +#define AHB_MSB_ADDR_PTR 0xfcfc > +#define GEN_REG_OFFSH 0xd000 > +#define REG_SW_RESET 0x0010 > +#define REG_SW_LOAD_COMPLETE 0x0014 > +#define REG_CMDWR_ADDRH 0x0028 > +#define REG_CMDWR_ADDRL 0x002a > +#define REG_CMDRD_ADDRH 0x002c > +#define REG_CMDRD_ADDRL 0x002e > + > +#define REG_CMDBUF0_ADDR 0x0f12 > +#define REG_CMDBUF1_ADDR 0x0f10 > + > +/* > + * Host S/W Register interface (0x70000000 - 0x70002000) > + * The value of the two most significant address bytes is 0x7000, > + * (HOST_SWIF_OFFS_H). The register addresses below specify 2 LSBs. > + */ > +#define HOST_SWIF_OFFSH 0x7000 > + > +/* Initialization parameters */ > +/* Master clock frequency in KHz */ > +#define REG_I_INCLK_FREQ_L 0x01b8 > +#define REG_I_INCLK_FREQ_H 0x01ba > +#define REG_I_USE_NPVI_CLOCKS 0x01c6 > +#define REG_I_USE_NMIPI_CLOCKS 0x01c8 > + > +/* Clock configurations, n = 0..3. REG_I_* frequency unit is 4 kHz. */ > +#define REG_I_OPCLK_4KHZ(n) ((n) * 6 + 0x01cc) > +#define REG_I_MIN_OUTRATE_4KHZ(n) ((n) * 6 + 0x01ce) > +#define REG_I_MAX_OUTRATE_4KHZ(n) ((n) * 6 + 0x01d0) > +#define REG_I_INIT_PARAMS_UPDATED 0x01e0 > +#define MIN_MCLK_FREQ_KHZ 6000U > +#define MAX_MCLK_FREQ_KHZ 27000U > +#define S5K6AA_MIN_PCLK_FREQ 12000U > +#define S5K6AA_MAX_PCLK_FREQ 24000U > + > +/* General purpose parameters */ > +#define REG_USER_BRIGHTNESS 0x01e4 > +#define REG_USER_CONTRAST 0x01e6 > +#define REG_USER_SATURATION 0x01e8 > +#define REG_USER_SHARPBLUR 0x01ea > +#define REG_G_SPEC_EFFECTS 0x01ee > +#define REG_G_ENABLE_PREV 0x01f0 > +#define REG_G_ENABLE_PREV_CHG 0x01f2 > +#define REG_G_NEW_CFG_SYNC 0x01f8 > + > +#define REG_G_PREVZOOM_IN_WIDTH 0x020a > +#define REG_G_PREVZOOM_IN_HEIGHT 0x020c > +#define REG_G_PREVZOOM_IN_XOFFS 0x020e > +#define REG_G_PREVZOOM_IN_YOFFS 0x0210 > +#define REG_G_INPUTS_CHANGE_REQ 0x021a > + > +#define REG_G_ACTIVE_PREV_CFG 0x021c > +#define REG_G_PREV_CFG_CHG 0x021e > +#define REG_G_PREV_OPEN_AFTER_CH 0x0220 > +#define REG_G_PREV_CFG_ERROR 0x0222 > + > +/* Preview control section. n = 0...4. */ > +#define PREG(n, x) ((n) * 0x26 + x) > +#define REG_P_OUT_WIDTH(n) PREG(n, 0x0242) > +#define REG_P_OUT_HEIGHT(n) PREG(n, 0x0244) > +#define REG_P_FMT(n) PREG(n, 0x0246) > +#define REG_P_MAX_OUT_RATE(n) PREG(n, 0x0248) > +#define REG_P_MIN_OUT_RATE(n) PREG(n, 0x024a) > +#define REG_P_PVI_MASK(n) PREG(n, 0x024c) > +#define REG_P_CLK_INDEX(n) PREG(n, 0x024e) > +#define REG_P_FR_RATE_TYPE(n) PREG(n, 0x0250) > +#define FR_RATE_DYNAMIC 0 > +#define FR_RATE_FIXED 1 > +#define FR_RATE_FIXED_ACCURATE 2 > +#define REG_P_FR_RATE_Q_TYPE(n) PREG(n, 0x0252) > +#define FR_RATE_Q_BEST_FRRATE 1 /* Binning enabled */ > +#define FR_RATE_Q_BEST_QUALITY 2 /* Binning disabled */ > +/* Frame period in 0.1 ms units */ > +#define REG_P_MAX_FR_TIME(n) PREG(n, 0x0254) > +#define REG_P_MIN_FR_TIME(n) PREG(n, 0x0256) > +/* Conversion to REG_P_[MAX/MIN]_FR_TIME value; __t: time in us */ > +#define US_TO_FR_TIME(__t) ((__t) / 100) > +#define S5K6AA_MIN_FR_TIME 33300 /* us */ > +#define S5K6AA_MAX_FR_TIME 650000 /* us */ > +#define S5K6AA_MAX_HIGH_RES_FR_TIME 666 /* x100 us */ > +/* The below 5 registers are for "device correction" values */ > +#define REG_P_COLORTEMP(n) PREG(n, 0x025e) > +#define REG_P_PREV_MIRROR(n) PREG(n, 0x0262) > + > +/* Extended image property controls */ > +/* Exposure time in 10 us units */ > +#define REG_SF_USR_EXPOSURE_L 0x03c6 > +#define REG_SF_USR_EXPOSURE_H 0x03c8 > +#define REG_SF_USR_EXPOSURE_CHG 0x03ca > +#define REG_SF_USR_TOT_GAIN 0x03cc > +#define REG_SF_USR_TOT_GAIN_CHG 0x03ce > +#define REG_SF_FLICKER_QUANT 0x03dc > +#define REG_SF_FLICKER_QUANT_CHG 0x03de > + > +/* Output interface (parallel/MIPI) setup */ > +#define REG_OIF_EN_MIPI_LANES 0x03fa > +#define REG_OIF_EN_PACKETS 0x03fc > +#define REG_OIF_CFG_CHG 0x03fe > + > +/* Auto-algorithms enable mask */ > +#define REG_DBG_AUTOALG_EN 0x0400 > +#define AALG_ALL_EN_MASK (1 << 0) > +#define AALG_AE_EN_MASK (1 << 1) > +#define AALG_DIVLEI_EN_MASK (1 << 2) > +#define AALG_WB_EN_MASK (1 << 3) > +#define AALG_FLICKER_EN_MASK (1 << 5) > +#define AALG_FIT_EN_MASK (1 << 6) > +#define AALG_WRHW_EN_MASK (1 << 7) > + > +/* Firmware revision information */ > +#define REG_FW_APIVER 0x012e > +#define S5K6AAFX_FW_APIVER 0x0001 > +#define REG_FW_REVISION 0x0130 > + > +/* For now we use only one user configuration register set */ > +#define S5K6AA_MAX_PRESETS 1 > + > +static const char * const s5k6aa_supply_names[] = { > + "vdd_core", /* Digital core supply 1.5V (1.4V to 1.6V) */ > + "vdda", /* Analog power supply 2.8V (2.6V to 3.0V) */ > + "vdd_reg", /* Regulator input power 1.8V (1.7V to 1.9V) > + or 2.8V (2.6V to 3.0) */ > + "vddio", /* I/O supply 1.8V (1.65V to 1.95V) > + or 2.8V (2.5V to 3.1V) */ > +}; > +#define S5K6AA_NUM_SUPPLIES ARRAY_SIZE(s5k6aa_supply_names) > + > +enum s5k6aa_gpio_id { > + STBY, > + RST, > + GPIO_NUM, > +}; > + > +struct s5k6aa_regval { > + u16 addr; > + u16 val; > +}; > + > +struct s5k6aa_pixfmt { > + enum v4l2_mbus_pixelcode code; > + u32 colorspace; > + /* REG_P_FMT(x) register value */ > + u16 reg_p_fmt; > +}; > + > +struct s5k6aa_preset { > + struct v4l2_frmsize_discrete out_size; > + struct v4l2_rect in_win; > + const struct s5k6aa_pixfmt *pixfmt; > + unsigned int inv_hflip:1; > + unsigned int inv_vflip:1; > + u8 frame_rate_type; > + u8 index; > +}; > + > +/* Not all controls supported by the driver are in this struct. */ > +struct s5k6aa_ctrls { > + struct v4l2_ctrl_handler handler; > + /* Mirror cluster */ > + struct v4l2_ctrl *hflip; > + struct v4l2_ctrl *vflip; > + /* Auto exposure / manual exposure and gain cluster */ > + struct v4l2_ctrl *auto_exp; > + struct v4l2_ctrl *exposure; > + struct v4l2_ctrl *gain; > +}; > + > +struct s5k6aa_interval { > + u16 reg_fr_time; > + struct v4l2_fract interval; > + /* Maximum rectangle for the interval */ > + struct v4l2_frmsize_discrete size; > +}; > + > +struct s5k6aa { > + struct v4l2_subdev sd; > + struct media_pad pad; > + > + enum v4l2_mbus_type bus_type; > + u8 mipi_lanes; > + > + int (*s_power)(int enable); > + struct regulator_bulk_data supplies[S5K6AA_NUM_SUPPLIES]; > + struct s5k6aa_gpio gpio[GPIO_NUM]; > + > + /* master clock frequency */ > + unsigned long mclk_frequency; > + u16 clk_fop; > + u16 clk_fmin; > + u16 clk_fmax; > + > + /* protects the struct members below */ > + struct mutex lock; > + > + struct s5k6aa_ctrls ctrls; > + struct s5k6aa_preset presets[S5K6AA_MAX_PRESETS]; > + struct s5k6aa_preset *preset; > + const struct s5k6aa_interval *fiv; > + > + unsigned int streaming:1; > + unsigned int apply_new_cfg:1; > + unsigned int power; > +}; > + > +static struct s5k6aa_regval s5k6aa_analog_config[] = { > + /* Analog settings */ > + { 0x112A, 0x0000 }, { 0x1132, 0x0000 }, > + { 0x113E, 0x0000 }, { 0x115C, 0x0000 }, > + { 0x1164, 0x0000 }, { 0x1174, 0x0000 }, > + { 0x1178, 0x0000 }, { 0x077A, 0x0000 }, > + { 0x077C, 0x0000 }, { 0x077E, 0x0000 }, > + { 0x0780, 0x0000 }, { 0x0782, 0x0000 }, > + { 0x0784, 0x0000 }, { 0x0786, 0x0000 }, > + { 0x0788, 0x0000 }, { 0x07A2, 0x0000 }, > + { 0x07A4, 0x0000 }, { 0x07A6, 0x0000 }, > + { 0x07A8, 0x0000 }, { 0x07B6, 0x0000 }, > + { 0x07B8, 0x0002 }, { 0x07BA, 0x0004 }, > + { 0x07BC, 0x0004 }, { 0x07BE, 0x0005 }, > + { 0x07C0, 0x0005 }, { S5K6AA_TERM, 0 }, A number of the hexadecimals are upper case. Should be lower. > +}; > + > +/* TODO: Add RGB888 and Bayer format */ > +static const struct s5k6aa_pixfmt s5k6aa_formats[] = { > + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 }, > + /* range 16-240 */ > + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_REC709, 6 }, > + { V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_JPEG, 0 }, > +}; > + > +static const struct s5k6aa_interval s5k6aa_intervals[] = { > + { 1000, {10000, 1000000}, {1280, 1024} }, /* 10 fps */ > + { 666, {15000, 1000000}, {1280, 1024} }, /* 15 fps */ > + { 500, {20000, 1000000}, {1280, 720} }, /* 20 fps */ > + { 400, {25000, 1000000}, {640, 480} }, /* 25 fps */ > + { 333, {33300, 1000000}, {640, 480} }, /* 30 fps */ > +}; > + > +#define S5K6AA_INTERVAL_DEF_INDEX 1 /* 15 fps */ > + > +static struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl) > +{ > + return &container_of(ctrl->handler, struct s5k6aa, ctrls.handler)->sd; > +} > + > +static struct s5k6aa *to_s5k6aa(struct v4l2_subdev *sd) > +{ > + return container_of(sd, struct s5k6aa, sd); > +} > + > +/* Set initial values for all preview presets */ > +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, > + int hflip, int vflip) > +{ > + struct s5k6aa_preset *preset = &s5k6aa->presets[0]; > + int i; > + > + for (i = 0; i < S5K6AA_MAX_PRESETS; i++) { > + preset->pixfmt = &s5k6aa_formats[0]; > + preset->frame_rate_type = FR_RATE_DYNAMIC; > + preset->inv_hflip = hflip; > + preset->inv_vflip = vflip; > + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; > + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; > + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; > + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; > + preset->in_win.left = 0; > + preset->in_win.top = 0; Much of this data is static, why is it copied to the presets struct? What is the intended purpose of these presets? > + preset->index = i; > + preset++; > + } > + > + s5k6aa->fiv = &s5k6aa_intervals[S5K6AA_INTERVAL_DEF_INDEX]; > + s5k6aa->preset = &s5k6aa->presets[0]; > +} > + > +static int s5k6aa_i2c_read(struct i2c_client *client, u16 addr, u16 *val) > +{ > + u8 wbuf[2] = {addr >> 8, addr & 0xFF}; > + struct i2c_msg msg[2]; > + u8 rbuf[2]; > + int ret; > + > + msg[0].addr = client->addr; > + msg[0].flags = 0; > + msg[0].len = 2; > + msg[0].buf = wbuf; > + > + msg[1].addr = client->addr; > + msg[1].flags = I2C_M_RD; > + msg[1].len = 2; > + msg[1].buf = rbuf; > + > + ret = i2c_transfer(client->adapter, msg, 2); > + *val = be16_to_cpu(*((u16 *)rbuf)); > + > + v4l2_dbg(3, debug, client, "i2c_read: 0x%04X : 0x%04x\n", addr, *val); > + > + return ret == 2 ? 0 : ret; > +} > + > +static int s5k6aa_i2c_write(struct i2c_client *client, u16 addr, u16 val) > +{ > + u8 buf[4] = {addr >> 8, addr & 0xFF, val >> 8, val & 0xFF}; > + > + int ret = i2c_master_send(client, buf, 4); > + v4l2_dbg(3, debug, client, "i2c_write: 0x%04X : 0x%04x\n", addr, val); > + > + return ret == 4 ? 0 : ret; > +} > + > +/* The command register write, assumes Command_Wr_addH = 0x7000. */ > +static int s5k6aa_write(struct i2c_client *c, u16 addr, u16 val) > +{ > + int ret = s5k6aa_i2c_write(c, REG_CMDWR_ADDRL, addr); > + if (ret) > + return ret; > + return s5k6aa_i2c_write(c, REG_CMDBUF0_ADDR, val); > +} > + > +/* The command register read, assumes Command_Rd_addH = 0x7000. */ > +static int s5k6aa_read(struct i2c_client *client, u16 addr, u16 *val) > +{ > + int ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRL, addr); > + if (ret) > + return ret; > + return s5k6aa_i2c_read(client, REG_CMDBUF0_ADDR, val); > +} > + > +static int s5k6aa_write_array(struct v4l2_subdev *sd, > + const struct s5k6aa_regval *msg) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(sd); > + u16 addr_incr = 0; > + int ret = 0; > + > + while (msg->addr != S5K6AA_TERM) { > + if (addr_incr != 2) > + ret = s5k6aa_i2c_write(client, REG_CMDWR_ADDRL, > + msg->addr); > + if (ret) > + break; > + ret = s5k6aa_i2c_write(client, REG_CMDBUF0_ADDR, msg->val); > + if (ret) > + break; > + /* Assume that msg->addr is always less than 0xfffc */ > + addr_incr = (msg + 1)->addr - msg->addr; > + msg++; > + } > + > + return ret; > +} > + > +/* Configure the AHB high address bytes for GTG registers access */ > +static int s5k6aa_set_ahb_address(struct i2c_client *client) > +{ > + int ret = s5k6aa_i2c_write(client, AHB_MSB_ADDR_PTR, GEN_REG_OFFSH); > + if (ret) > + return ret; > + ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRH, HOST_SWIF_OFFSH); > + if (ret) > + return ret; > + return s5k6aa_i2c_write(client, REG_CMDWR_ADDRH, HOST_SWIF_OFFSH); > +} > + > +/** > + * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration > + * > + * Configure the internal ISP PLL for 24 MHz output frequency. > + * Locking: called with s5k6aa->lock mutex held. > + */ > +static int s5k6aa_configure_pixel_clock(struct s5k6aa *s5k6aa) > +{ > + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); > + unsigned long fmclk = s5k6aa->mclk_frequency / 1000; > + int ret; > + > + if (WARN(fmclk < MIN_MCLK_FREQ_KHZ || fmclk > MAX_MCLK_FREQ_KHZ, > + "Invalid clock frequency: %ld\n", fmclk)) > + return -EINVAL; > + > + s5k6aa->clk_fop = 24000000U / 4000U; > + s5k6aa->clk_fmin = 48000000U / 4000U; > + s5k6aa->clk_fmax = 56000000U / 4000U; > + > + /* External input clock frequency in kHz */ > + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_H, fmclk >> 16); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_L, fmclk & 0xFFFF); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_USE_NPVI_CLOCKS, 1); > + /* Internal PLL frequency */ > + if (!ret) > + ret = s5k6aa_write(c, REG_I_OPCLK_4KHZ(0), s5k6aa->clk_fop); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_MIN_OUTRATE_4KHZ(0), > + s5k6aa->clk_fmin); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_MAX_OUTRATE_4KHZ(0), > + s5k6aa->clk_fmax); > + return ret ? ret : s5k6aa_write(c, REG_I_INIT_PARAMS_UPDATED, 1); > +} > + > +/* Set horizontal and vertical image flipping */ > +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + struct s5k6aa_preset *preset = s5k6aa->preset; > + > + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; > + unsigned int hflip = horiz_flip ^ preset->inv_hflip; I don't see a need to store inv_hflip to presets. Instead, you might just have a mirror bit in the platform data. > + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), > + hflip | (vflip << 1)); > +} > + > +/* Program FW with exposure time, 'exposure' in us units */ > +static int s5k6aa_set_user_exposure(struct i2c_client *client, int exposure) > +{ > + unsigned int time = exposure / 10; > + > + int ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_L, time & 0xffff); > + if (!ret) > + ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_H, time >> 16); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_SF_USR_EXPOSURE_CHG, 1); > +} > + > +static int s5k6aa_set_user_gain(struct i2c_client *client, int gain) > +{ > + int ret = s5k6aa_write(client, REG_SF_USR_TOT_GAIN, gain); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_SF_USR_TOT_GAIN_CHG, 1); > +} > + > +/* Set auto/manual exposure and total gain */ > +static int s5k6aa_set_auto_exposure(struct s5k6aa *s5k6aa, int value) > +{ > + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); > + unsigned int exp_time = s5k6aa->ctrls.exposure->val; > + u16 auto_alg; > + > + int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &auto_alg); > + if (ret) > + return ret; > + > + v4l2_dbg(1, debug, c, "man_exp: %d, auto_exp: %d, a_alg: 0x%x\n", > + exp_time, value, auto_alg); > + > + if (value == V4L2_EXPOSURE_AUTO) { > + auto_alg |= AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK; > + } else { > + ret = s5k6aa_set_user_exposure(c, exp_time); > + if (ret) > + return ret; > + ret = s5k6aa_set_user_gain(c, s5k6aa->ctrls.gain->val); > + if (ret) > + return ret; > + auto_alg &= ~(AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK); > + } > + > + return s5k6aa_write(c, REG_DBG_AUTOALG_EN, auto_alg); > +} > + > +static int s5k6aa_set_anti_flicker(struct s5k6aa *s5k6aa, int value) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 auto_alg; > + int ret; > + > + ret = s5k6aa_read(client, REG_DBG_AUTOALG_EN, &auto_alg); > + if (ret) > + return ret; > + > + if (value == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) { > + auto_alg |= AALG_FLICKER_EN_MASK; > + } else { > + auto_alg &= ~AALG_FLICKER_EN_MASK; > + /* The V4L2_CID_LINE_FREQUENCY control values are > + * suitable for writing directly to this register */ > + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT, value); > + if (ret) > + return ret; > + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT_CHG, 1); > + if (ret) > + return ret; > + } > + > + return s5k6aa_write(client, REG_DBG_AUTOALG_EN, auto_alg); > +} > + > +static int s5k6aa_set_colorfx(struct s5k6aa *s5k6aa, int val) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + static const struct v4l2_control colorfx[] = { > + { V4L2_COLORFX_NONE, 0 }, > + { V4L2_COLORFX_BW, 1 }, > + { V4L2_COLORFX_NEGATIVE, 2 }, > + { V4L2_COLORFX_SEPIA, 3 }, > + { V4L2_COLORFX_SKY_BLUE, 4 }, > + { V4L2_COLORFX_SKETCH, 5 }, > + }; > + int i; > + > + for (i = 0; i < ARRAY_SIZE(colorfx); i++) { > + if (colorfx[i].id == val) > + return s5k6aa_write(client, REG_G_SPEC_EFFECTS, > + colorfx[i].value); > + } > + return -EINVAL; > +} > + > +static int s5k6aa_get_preview_cfg_status(struct i2c_client *client) > +{ > + u16 error = 0; > + int ret = s5k6aa_read(client, REG_G_PREV_CFG_ERROR, &error); > + > + v4l2_dbg(1, debug, client, "error: 0x%x (%d)\n", error, ret); > + return ret ? ret : (error == 0 ? 0 : -EINVAL); > +} > + > +static int s5k6aa_set_output_framefmt(struct s5k6aa *s5k6aa, > + struct s5k6aa_preset *preset, bool apply) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int ret; > + > + if (WARN_ON(preset->pixfmt == NULL)) > + return -EINVAL; > + > + ret = s5k6aa_write(client, REG_P_OUT_WIDTH(preset->index), > + preset->out_size.width); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_OUT_HEIGHT(preset->index), > + preset->out_size.height); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FMT(preset->index), > + preset->pixfmt->reg_p_fmt); > + if (!ret && apply) { > + ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); > + if (!ret) > + ret = s5k6aa_get_preview_cfg_status(client); > + } > + > + return ret; > +} > + > +/** > + * s5k6aa_configure_video_bus - configure the video output interface > + * @bus_type: video bus type: parallel or MIPI-CSI > + * @nlanes: number of MIPI lanes to be used (MIPI-CSI only) > + * > + * Note: Only parallel bus operation has been tested. > + */ > +static int s5k6aa_configure_video_bus(struct s5k6aa *s5k6aa, > + enum v4l2_mbus_type bus_type, int nlanes) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 cfg = 0; > + int ret; > + > + /* > + * TODO: The sensor is supposed to support BT.601 and BT.656 > + * but there is nothing indicating how to switch between both > + * in the datasheet. For now default BT.601 interface is assumed. > + */ > + if (bus_type == V4L2_MBUS_CSI2) > + cfg = nlanes; > + else if (bus_type != V4L2_MBUS_PARALLEL) > + return -EINVAL; > + > + ret = s5k6aa_write(client, REG_OIF_EN_MIPI_LANES, cfg); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_OIF_CFG_CHG, 1); > +} > + > +static int s5k6aa_sync_preview_preset(struct i2c_client *client, int timeout) > +{ > + unsigned long end = jiffies + msecs_to_jiffies(timeout); > + u16 reg = 1; > + > + int ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); > + if (timeout == 0) > + return ret; > + > + while (ret >= 0 && time_is_after_jiffies(end)) { > + ret = s5k6aa_read(client, REG_G_NEW_CFG_SYNC, ®); > + if (!reg) > + return 0; > + usleep_range(1000, 5000); > + } > + return ret ? ret : -ETIMEDOUT; > +} > + > +/** > + * s5k6aa_set_preview_preset - write user preview register set > + * > + * Configure pixel clock frequency range, device frame rate type > + * and frame period range. > + */ > +static int s5k6aa_set_preview_preset(struct s5k6aa *s5k6aa, > + struct s5k6aa_preset *preset) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int idx = preset->index; > + u16 frame_rate_q; > + int ret; > + > + if (s5k6aa->fiv->reg_fr_time >= S5K6AA_MAX_HIGH_RES_FR_TIME) > + frame_rate_q = FR_RATE_Q_BEST_FRRATE; > + else > + frame_rate_q = FR_RATE_Q_BEST_QUALITY; > + > + ret = s5k6aa_set_output_framefmt(s5k6aa, preset, true); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MAX_OUT_RATE(idx), > + S5K6AA_MAX_PCLK_FREQ); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MIN_OUT_RATE(idx), > + S5K6AA_MIN_PCLK_FREQ); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FR_RATE_TYPE(idx), > + preset->frame_rate_type); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FR_RATE_Q_TYPE(idx), > + frame_rate_q); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MAX_FR_TIME(idx), > + s5k6aa->fiv->reg_fr_time + 15); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MIN_FR_TIME(idx), > + s5k6aa->fiv->reg_fr_time - 15); > + if (!ret) > + ret = s5k6aa_sync_preview_preset(client, 0); > + > + if (!ret) { > + ret = s5k6aa_get_preview_cfg_status(client); > + s5k6aa->apply_new_cfg = 0; > + } > + > + v4l2_dbg(1, debug, client, "frame interval: %d +/- 1.5ms. (%d)\n", > + s5k6aa->fiv->reg_fr_time, ret); > + return ret; > +} > + > +/** > + * s5k6aa_initialize_isp - basic ISP MCU initialization > + * > + * Configure AHB addresses for registers read/write; configure PLLs for > + * required output pixel clock. The ISP power supply needs to be already > + * enabled, with an optional H/W reset. > + * Locking: called with s5k6aa.lock mutex held. > + */ > +static int s5k6aa_initialize_isp(struct v4l2_subdev *sd) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(sd); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + s5k6aa->apply_new_cfg = 1; > + > + ret = s5k6aa_set_ahb_address(client); > + if (ret) > + return ret; > + ret = s5k6aa_configure_video_bus(s5k6aa, s5k6aa->bus_type, > + s5k6aa->mipi_lanes); > + if (ret) > + return ret; > + ret = s5k6aa_write_array(sd, s5k6aa_analog_config); > + if (ret) > + return ret; > + msleep(100); > + > + return s5k6aa_configure_pixel_clock(s5k6aa); > +} > + > +static int s5k6aa_gpio_set_value(struct s5k6aa *priv, int id, u32 val) > +{ > + if (!gpio_is_valid(priv->gpio[id].gpio)) > + return 0; > + gpio_set_value(priv->gpio[id].gpio, !!val); > + return 1; > +} > + > +static int s5k6aa_gpio_assert(struct s5k6aa *priv, int id) > +{ > + return s5k6aa_gpio_set_value(priv, id, priv->gpio[id].level); > +} > + > +static int s5k6aa_gpio_deassert(struct s5k6aa *priv, int id) > +{ > + return s5k6aa_gpio_set_value(priv, id, !priv->gpio[id].level); > +} > + > +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) > +{ > + int ret; > + > + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > + if (ret) > + return ret; > + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) > + udelay(200); It's a small delay but still a busy loop. What about usleep_range() for the same length? > + > + if (s5k6aa->s_power) > + ret = s5k6aa->s_power(1); > + usleep_range(4000, 4000); > + > + if (s5k6aa_gpio_deassert(s5k6aa, RST)) > + msleep(20); > + > + return ret; > +} > + > +static int __s5k6aa_power_disable(struct s5k6aa *s5k6aa) > +{ > + int ret; > + > + if (s5k6aa_gpio_assert(s5k6aa, RST)) > + udelay(100); Same here. > + if (s5k6aa->s_power) { > + ret = s5k6aa->s_power(0); > + if (ret) > + return ret; > + } > + if (s5k6aa_gpio_assert(s5k6aa, STBY)) > + udelay(50); > + > + return regulator_bulk_disable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > +} > + > +/* > + * V4L2 subdev core and video operations > + */ > +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret = 0; > + > + mutex_lock(&s5k6aa->lock); > + > + if (!on == s5k6aa->power) { > + if (on) { > + ret = __s5k6aa_power_enable(s5k6aa); > + if (!ret) > + ret = s5k6aa_initialize_isp(sd); > + } else { > + ret = __s5k6aa_power_disable(s5k6aa); > + } > + } > + if (!ret && !WARN_ON(s5k6aa->power < 0)) > + s5k6aa->power += on ? 1 : -1; > + mutex_unlock(&s5k6aa->lock); > + > + if (!ret && on && s5k6aa->power == 1) > + return v4l2_ctrl_handler_setup(sd->ctrl_handler); > + > + return ret; > +} > + > +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int ret; > + > + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); > + if (!ret) > + s5k6aa->streaming = enable; > + > + return ret; > +} > + > +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret = 0; > + > + mutex_lock(&s5k6aa->lock); > + > + if (!s5k6aa->streaming == !on) { > + mutex_unlock(&s5k6aa->lock); > + return 0; > + } > + if (s5k6aa->apply_new_cfg) > + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); > + if (!ret) > + ret = __s5k6aa_stream(s5k6aa, !!on); > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + memset(fi->reserved, 0, sizeof(fi->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + fi->interval = s5k6aa->fiv->interval; > + mutex_unlock(&s5k6aa->lock); > + > + return 0; > +} > + > +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct v4l2_frmsize_discrete *out_win = &s5k6aa->preset->out_size; > + const struct s5k6aa_interval *fiv = &s5k6aa_intervals[0]; > + unsigned int err, min_err = UINT_MAX; > + unsigned int i, fr_time; > + > + if (fi->interval.denominator == 0) > + return -EINVAL; > + > + memset(fi->reserved, 0, sizeof(fi->reserved)); > + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa_intervals); i++) { > + const struct s5k6aa_interval *iv = &s5k6aa_intervals[i]; > + > + if (out_win->width > iv->size.width || > + out_win->height > iv->size.height) > + continue; > + > + err = abs(iv->reg_fr_time - fr_time); > + if (err < min_err) { > + fiv = iv; > + min_err = err; > + } > + } > + s5k6aa->fiv = fiv; > + > + v4l2_dbg(1, debug, &s5k6aa->sd, "Changed frame interval to %d us\n", > + fiv->reg_fr_time * 100); > + return 0; > +} > + > +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", > + fi->interval.numerator, fi->interval.denominator); > + > + mutex_lock(&s5k6aa->lock); > + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); > + s5k6aa->apply_new_cfg = 1; > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +/* > + * V4L2 subdev pad level operations > + */ > +static int s5k6aa_enum_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_frame_interval_enum *fie) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + const struct s5k6aa_interval *fi; > + int ret = 0; > + > + if (fie->index > ARRAY_SIZE(s5k6aa_intervals)) > + return -EINVAL; > + > + memset(fie->reserved, 0, sizeof(fie->reserved)); > + > + v4l_bound_align_image(&fie->width, S5K6AA_WIN_WIDTH_MIN, > + S5K6AA_WIN_WIDTH_MAX, 1, > + &fie->height, S5K6AA_WIN_HEIGHT_MIN, > + S5K6AA_WIN_HEIGHT_MAX, 1, 0); > + > + mutex_lock(&s5k6aa->lock); > + fi = &s5k6aa_intervals[fie->index]; > + if (fie->width > fi->size.width || fie->height > fi->size.height) > + ret = -EINVAL; > + else > + fie->interval = fi->interval; > + mutex_unlock(&s5k6aa->lock); > + > + return ret; > +} > + > +static int s5k6aa_enum_mbus_code(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_mbus_code_enum *code) > +{ > + if (code->index >= ARRAY_SIZE(s5k6aa_formats)) > + return -EINVAL; > + > + code->code = s5k6aa_formats[code->index].code; > + return 0; > +} > + > +static int s5k6aa_enum_frame_size(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + int i = ARRAY_SIZE(s5k6aa_formats); > + > + if (fse->index > 0) > + return -EINVAL; > + > + while (--i) > + if (fse->code == s5k6aa_formats[i].code) > + break; > + > + fse->code = s5k6aa_formats[i].code; > + memset(fse->reserved, 0, sizeof(fse->reserved)); > + > + fse->min_width = S5K6AA_WIN_WIDTH_MIN; > + fse->max_width = S5K6AA_WIN_WIDTH_MAX; > + fse->max_height = S5K6AA_WIN_HEIGHT_MIN; > + fse->min_height = S5K6AA_WIN_HEIGHT_MAX; > + > + return 0; > +} > + > +static const struct s5k6aa_pixfmt *s5k6aa_try_format(struct s5k6aa *s5k6aa, > + struct v4l2_mbus_framefmt *mf) > +{ > + int i; > + > + v4l_bound_align_image(&mf->width, S5K6AA_WIN_WIDTH_MIN, > + S5K6AA_WIN_WIDTH_MAX, 1, > + &mf->height, S5K6AA_WIN_HEIGHT_MIN, > + S5K6AA_WIN_HEIGHT_MAX, 1, 0); > + > + if (mf->colorspace != V4L2_COLORSPACE_JPEG && > + mf->colorspace != V4L2_COLORSPACE_REC709) > + mf->colorspace = V4L2_COLORSPACE_JPEG; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa_formats); i++) { > + if (mf->colorspace == s5k6aa_formats[i].colorspace && > + mf->code == s5k6aa_formats[i].code) > + return &s5k6aa_formats[i]; > + } > + mf->colorspace = s5k6aa_formats[0].colorspace; > + mf->code = s5k6aa_formats[0].code; > + > + return &s5k6aa_formats[0]; > +} > + > +static int s5k6aa_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + struct s5k6aa_preset *preset = s5k6aa->preset; > + struct s5k6aa_pixfmt const *pixfmt; > + struct v4l2_mbus_framefmt *mf; > + int ret = 0; > + > + pixfmt = s5k6aa_try_format(s5k6aa, &fmt->format); > + > + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > + if (fh) { > + mf = v4l2_subdev_get_try_format(fh, fmt->pad); > + *mf = fmt->format; > + } > + return 0; > + } > + memset(fmt->reserved, 0, sizeof(fmt->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + mf = &fmt->format; > + if (!s5k6aa->streaming) { > + preset->pixfmt = pixfmt; > + preset->out_size.width = mf->width; > + preset->out_size.height = mf->height; > + s5k6aa->apply_new_cfg = 1; > + } else { > + ret = -EBUSY; > + } > + > + v4l2_dbg(1, debug, sd, "Resolution: %dx%d (%d)\n", > + mf->width, mf->height, s5k6aa->streaming); > + > + /* Reset to minimum possible frame interval */ > + if (!ret) { > + struct v4l2_subdev_frame_interval fiv = { > + .interval = {0, 1} > + }; > + ret = __s5k6aa_set_frame_interval(s5k6aa, &fiv); > + } > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +static void s5k6aa_get_preset_fmt(struct s5k6aa_preset *preset, > + struct v4l2_mbus_framefmt *mf) > +{ > + mf->colorspace = preset->pixfmt->colorspace; > + mf->code = preset->pixfmt->code; > + mf->field = V4L2_FIELD_NONE; > + mf->width = preset->out_size.width; > + mf->height = preset->out_size.height; > +} > + > +static int s5k6aa_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > + if (fh) { > + struct v4l2_mbus_framefmt *mf; > + mf = v4l2_subdev_get_try_format(fh, 0); > + fmt->format = *mf; > + } > + return 0; > + } > + memset(fmt->reserved, 0, sizeof(fmt->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + s5k6aa_get_preset_fmt(s5k6aa->preset, &fmt->format); > + mutex_unlock(&s5k6aa->lock); > + return 0; > +} > + > +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { > + .enum_mbus_code = s5k6aa_enum_mbus_code, > + .enum_frame_size = s5k6aa_enum_frame_size, > + .enum_frame_interval = s5k6aa_enum_frame_interval, > + .get_fmt = s5k6aa_get_fmt, > + .set_fmt = s5k6aa_set_fmt, > +}; > + > +/* > + * V4L2 subdev control operations > + */ > +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) > +{ > + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); > + struct i2c_client *c = v4l2_get_subdevdata(sd); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int pid, err = 0; > + > + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", > + __func__, ctrl->id, ctrl->val); > + > + mutex_lock(&s5k6aa->lock); > + /* > + * If the device is not powered up by the host driver do > + * not apply any controls to H/W at this time. Instead > + * the controls will be restored right after power-up. > + */ > + if (s5k6aa->power == 0) > + goto unlock; > + pid = s5k6aa->preset->index; > + > + switch (ctrl->id) { > + case V4L2_CID_BRIGHTNESS: > + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); > + break; > + > + case V4L2_CID_COLORFX: > + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_CONTRAST: > + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); > + break; > + > + case V4L2_CID_EXPOSURE_AUTO: > + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_HFLIP: > + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_POWER_LINE_FREQUENCY: > + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_SATURATION: > + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); > + break; > + > + case V4L2_CID_SHARPNESS: > + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); > + break; > + > + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: > + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); > + break; > + } > + /* This should be really called once per all controls update > + rather than per each control. */ > + if (!err) > + err = s5k6aa_sync_preview_preset(c, 0); > +unlock: > + mutex_unlock(&s5k6aa->lock); > + return err; > +} > + > +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { > + .s_ctrl = s5k6aa_s_ctrl, > +}; > + > +static int s5k6aa_log_status(struct v4l2_subdev *sd) > +{ > + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); > + return 0; > +} > + > +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { > + .g_frame_interval = s5k6aa_g_frame_interval, > + .s_frame_interval = s5k6aa_s_frame_interval, > + .s_stream = s5k6aa_s_stream, > +}; > + > +/* > + * V4L2 subdev internal operations > + */ > +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) > +{ > + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); > + > + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); > + return 0; > +} > + > +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 api_ver = 0, fw_rev = 0; > + > + int ret = s5k6aa_set_ahb_address(client); > + > + if (!ret) > + ret = s5k6aa_read(client, REG_FW_APIVER, &api_ver); > + if (!ret) > + ret = s5k6aa_read(client, REG_FW_REVISION, &fw_rev); > + if (ret) { > + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); > + return ret; > + } > + > + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", > + api_ver, fw_rev); > + > + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; > +} > + > +static int s5k6aa_registered(struct v4l2_subdev *sd) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + mutex_lock(&s5k6aa->lock); > + ret = __s5k6aa_power_enable(s5k6aa); > + if (!ret) { > + msleep(100); > + ret = s5k6aa_check_fw_revision(s5k6aa); > + __s5k6aa_power_disable(s5k6aa); > + } > + mutex_unlock(&s5k6aa->lock); > + > + return ret; > +} > + > +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { > + .registered = s5k6aa_registered, > + .open = s5k6aa_open, > +}; > + > +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { > + .s_power = s5k6aa_set_power, > + .g_ctrl = v4l2_subdev_g_ctrl, > + .s_ctrl = v4l2_subdev_s_ctrl, > + .queryctrl = v4l2_subdev_queryctrl, > + .querymenu = v4l2_subdev_querymenu, > + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, > + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, > + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, > + .log_status = s5k6aa_log_status, > +}; > + > +static const struct v4l2_subdev_ops s5k6aa_subdev_ops = { > + .core = &s5k6aa_core_ops, > + .pad = &s5k6aa_pad_ops, > + .video = &s5k6aa_video_ops, > +}; > + > +static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa) > +{ > + const struct v4l2_ctrl_ops *ops = &s5k6aa_ctrl_ops; > + struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls; > + struct v4l2_ctrl_handler *hdl = &ctrls->handler; > + > + int ret = v4l2_ctrl_handler_init(hdl, 12); > + if (ret) > + return ret; > + > + ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0); > + ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0); > + v4l2_ctrl_cluster(2, &ctrls->hflip); > + > + ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops, > + V4L2_CID_EXPOSURE_AUTO, > + V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); > + /* Exposure time: x 1 us */ > + ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE, > + 0, 6000000U, 1, 100000U); > + /* Total gain: 256 <=> 1x */ > + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, > + 0, 256, 1, 256); > + v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 0, false); > + > + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY, > + V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0, > + V4L2_CID_POWER_LINE_FREQUENCY_AUTO); > + > + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX, > + V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE); > + > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE, > + 0, 256, 1, 0); > + > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0); > + > + if (hdl->error) { > + ret = hdl->error; > + v4l2_ctrl_handler_free(hdl); > + return ret; > + } > + > + s5k6aa->sd.ctrl_handler = hdl; > + return 0; > +} > + > +/* > + * GPIO setup > + */ > +static int s5k6aa_configure_gpio(int nr, int val, const char *name) > +{ > + unsigned long flags = val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW; > + int ret; > + > + if (!gpio_is_valid(nr)) > + return 0; > + ret = gpio_request_one(nr, flags, name); > + if (!ret) > + gpio_export(nr, 0); > + return ret; > +} > + > +static void s5k6aa_free_gpios(struct s5k6aa *s5k6aa) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa->gpio); i++) { > + if (!gpio_is_valid(s5k6aa->gpio[i].gpio)) > + continue; > + gpio_free(s5k6aa->gpio[i].gpio); > + s5k6aa->gpio[i].gpio = -EINVAL; > + } > +} > + > +static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa, > + const struct s5k6aa_platform_data *pdata) > +{ > + const struct s5k6aa_gpio *gpio = &pdata->gpio_stby; > + int ret; > + > + s5k6aa->gpio[STBY].gpio = -EINVAL; > + s5k6aa->gpio[RST].gpio = -EINVAL; > + > + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_STBY"); > + if (ret) { > + s5k6aa_free_gpios(s5k6aa); > + return ret; > + } > + s5k6aa->gpio[STBY] = *gpio; > + if (gpio_is_valid(gpio->gpio)) > + gpio_set_value(gpio->gpio, 0); > + > + gpio = &pdata->gpio_reset; > + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_RST"); > + if (ret) { > + s5k6aa_free_gpios(s5k6aa); > + return ret; > + } > + s5k6aa->gpio[RST] = *gpio; > + if (gpio_is_valid(gpio->gpio)) > + gpio_set_value(gpio->gpio, 0); > + > + return 0; > +} > + > +static int s5k6aa_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + const struct s5k6aa_platform_data *pdata = client->dev.platform_data; > + struct v4l2_subdev *sd; > + struct s5k6aa *s5k6aa; > + int i, ret; > + > + if (pdata == NULL) { > + dev_err(&client->dev, "Platform data not specified\n"); > + return -EINVAL; > + } > + > + if (pdata->mclk_frequency == 0) { > + dev_err(&client->dev, "MCLK frequency not specified\n"); > + return -EINVAL; > + } > + > + s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); > + if (!s5k6aa) > + return -ENOMEM; > + > + mutex_init(&s5k6aa->lock); > + s5k6aa->mclk_frequency = pdata->mclk_frequency; > + s5k6aa->bus_type = pdata->bus_type; > + s5k6aa->mipi_lanes = pdata->nlanes; > + s5k6aa->s_power = pdata->set_power; > + > + sd = &s5k6aa->sd; > + strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name)); > + v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops); > + > + sd->internal_ops = &s5k6aa_subdev_internal_ops; > + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > + > + s5k6aa->pad.flags = MEDIA_PAD_FL_SOURCE; > + sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; > + ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); > + if (ret) > + goto out_err1; > + > + ret = s5k6aa_configure_gpios(s5k6aa, pdata); > + if (ret) > + goto out_err2; > + > + for (i = 0; i < S5K6AA_NUM_SUPPLIES; i++) > + s5k6aa->supplies[i].supply = s5k6aa_supply_names[i]; > + > + ret = regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES, > + s5k6aa->supplies); > + if (ret) { > + dev_err(&client->dev, "Failed to get regulators\n"); > + goto out_err2; > + } > + > + ret = s5k6aa_initialize_ctrls(s5k6aa); > + if (ret) > + goto out_err3; > + > + s5k6aa_presets_data_init(s5k6aa, pdata->horiz_flip, > + pdata->vert_flip); > + return 0; > + > +out_err3: > + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > +out_err2: > + media_entity_cleanup(&s5k6aa->sd.entity); > +out_err1: > + kfree(s5k6aa); > + return ret; > +} > + > +static int s5k6aa_remove(struct i2c_client *client) > +{ > + struct v4l2_subdev *sd = i2c_get_clientdata(client); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + v4l2_device_unregister_subdev(sd); > + v4l2_ctrl_handler_free(sd->ctrl_handler); > + media_entity_cleanup(&sd->entity); > + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > + s5k6aa_free_gpios(s5k6aa); > + kfree(s5k6aa); > + > + return 0; > +} > + > +static const struct i2c_device_id s5k6aa_id[] = { > + { DRIVER_NAME, 0 }, > + { }, > +}; > +MODULE_DEVICE_TABLE(i2c, s5k6aa_id); > + > + > +static struct i2c_driver s5k6aa_i2c_driver = { > + .driver = { > + .name = DRIVER_NAME > + }, > + .probe = s5k6aa_probe, > + .remove = s5k6aa_remove, > + .id_table = s5k6aa_id, > +}; > + > +static int __init s5k6aa_init(void) > +{ > + return i2c_add_driver(&s5k6aa_i2c_driver); > +} > + > +static void __exit s5k6aa_exit(void) > +{ > + i2c_del_driver(&s5k6aa_i2c_driver); > +} > + > +module_init(s5k6aa_init); > +module_exit(s5k6aa_exit); > + > +MODULE_DESCRIPTION("Samsung S5K6AA(FX) SXGA camera driver"); > +MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/include/media/s5k6aa.h b/include/media/s5k6aa.h > new file mode 100644 > index 0000000..a7c3dd4 > --- /dev/null > +++ b/include/media/s5k6aa.h > @@ -0,0 +1,51 @@ > +/* > + * S5K6AAFX camera sensor driver header > + * > + * Copyright (C) 2011 Samsung Electronics Co., Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#ifndef S5K6AA_H > +#define S5K6AA_H > + > +#include <media/v4l2-mediabus.h> > + > +/** > + * struct s5k6aa_gpio - data structure describing a GPIO > + * @gpio: GPIO number > + * @level: indicates active state of the @gpio > + */ > +struct s5k6aa_gpio { > + int gpio; > + int level; > +}; > + > +/** > + * struct s5k6aa_platform_data - s5k6aa driver platform data > + * @set_power: an additional callback to the board code, called > + * after enabling the regulators and before switching > + * the sensor off > + * @mclk_frequency: sensor's master clock frequency in Hz > + * @gpio_nreset: GPIO driving RESET pin > + * @gpio_nstby: GPIO driving STBY pin > + * @nlanes: maximum number of MIPI-CSI lanes used > + * @horiz_flip: default horizontal image flip value, non zero to enable > + * @vert_flip: default vertical image flip value, non zero to enable > + */ > + > +struct s5k6aa_platform_data { > + int (*set_power)(int enable); > + unsigned long mclk_frequency; > + struct s5k6aa_gpio gpio_reset; > + struct s5k6aa_gpio gpio_stby; > + enum v4l2_mbus_type bus_type; > + u8 nlanes; > + u8 horiz_flip; > + u8 vert_flip; > +}; > + > +#endif /* S5K6AA_H */ > -- > 1.7.6.3 > -- Sakari Ailus e-mail: sakari.ailus@iki.fi jabber/XMPP/Gmail: sailus@retiisi.org.uk ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-22 22:02 ` Sakari Ailus @ 2011-09-23 10:12 ` Sylwester Nawrocki 2011-09-25 10:08 ` Sakari Ailus 0 siblings, 1 reply; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-23 10:12 UTC (permalink / raw) To: Sakari Ailus Cc: linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Hi Sakari, On 09/23/2011 12:02 AM, Sakari Ailus wrote: > Hi Sylwester, > > I have a few additional comments below, they don't depend on my earlier > ones. Thanks a lot for your follow up review! > > On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: >> This driver exposes preview mode operation of the S5K6AAFX sensor with >> embedded SoC ISP. It uses one of the five user predefined configuration >> register sets. There is yet no support for capture (snapshot) operation. >> Following controls are supported: >> manual/auto exposure and gain, power line frequency (anti-flicker), >> saturation, sharpness, brightness, contrast, white balance temperature, >> color effects, horizontal/vertical image flip, frame interval. >> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- ... >> + >> +struct s5k6aa_pixfmt { >> + enum v4l2_mbus_pixelcode code; >> + u32 colorspace; >> + /* REG_P_FMT(x) register value */ >> + u16 reg_p_fmt; >> +}; >> + >> +struct s5k6aa_preset { >> + struct v4l2_frmsize_discrete out_size; >> + struct v4l2_rect in_win; >> + const struct s5k6aa_pixfmt *pixfmt; >> + unsigned int inv_hflip:1; >> + unsigned int inv_vflip:1; >> + u8 frame_rate_type; >> + u8 index; >> +}; >> + >> +/* Not all controls supported by the driver are in this struct. */ >> +struct s5k6aa_ctrls { >> + struct v4l2_ctrl_handler handler; >> + /* Mirror cluster */ >> + struct v4l2_ctrl *hflip; >> + struct v4l2_ctrl *vflip; >> + /* Auto exposure / manual exposure and gain cluster */ >> + struct v4l2_ctrl *auto_exp; >> + struct v4l2_ctrl *exposure; >> + struct v4l2_ctrl *gain; >> +}; >> + >> +struct s5k6aa_interval { >> + u16 reg_fr_time; >> + struct v4l2_fract interval; >> + /* Maximum rectangle for the interval */ >> + struct v4l2_frmsize_discrete size; >> +}; >> + >> +struct s5k6aa { >> + struct v4l2_subdev sd; >> + struct media_pad pad; >> + >> + enum v4l2_mbus_type bus_type; >> + u8 mipi_lanes; >> + >> + int (*s_power)(int enable); >> + struct regulator_bulk_data supplies[S5K6AA_NUM_SUPPLIES]; >> + struct s5k6aa_gpio gpio[GPIO_NUM]; >> + >> + /* master clock frequency */ >> + unsigned long mclk_frequency; >> + u16 clk_fop; >> + u16 clk_fmin; >> + u16 clk_fmax; >> + >> + /* protects the struct members below */ >> + struct mutex lock; >> + >> + struct s5k6aa_ctrls ctrls; >> + struct s5k6aa_preset presets[S5K6AA_MAX_PRESETS]; >> + struct s5k6aa_preset *preset; >> + const struct s5k6aa_interval *fiv; >> + >> + unsigned int streaming:1; >> + unsigned int apply_new_cfg:1; >> + unsigned int power; >> +}; >> + >> +static struct s5k6aa_regval s5k6aa_analog_config[] = { >> + /* Analog settings */ >> + { 0x112A, 0x0000 }, { 0x1132, 0x0000 }, >> + { 0x113E, 0x0000 }, { 0x115C, 0x0000 }, >> + { 0x1164, 0x0000 }, { 0x1174, 0x0000 }, >> + { 0x1178, 0x0000 }, { 0x077A, 0x0000 }, >> + { 0x077C, 0x0000 }, { 0x077E, 0x0000 }, >> + { 0x0780, 0x0000 }, { 0x0782, 0x0000 }, >> + { 0x0784, 0x0000 }, { 0x0786, 0x0000 }, >> + { 0x0788, 0x0000 }, { 0x07A2, 0x0000 }, >> + { 0x07A4, 0x0000 }, { 0x07A6, 0x0000 }, >> + { 0x07A8, 0x0000 }, { 0x07B6, 0x0000 }, >> + { 0x07B8, 0x0002 }, { 0x07BA, 0x0004 }, >> + { 0x07BC, 0x0004 }, { 0x07BE, 0x0005 }, >> + { 0x07C0, 0x0005 }, { S5K6AA_TERM, 0 }, > > A number of the hexadecimals are upper case. Should be lower. opps, looking at this so many times still missed that:) I'll fix it. > >> +}; >> + >> +/* TODO: Add RGB888 and Bayer format */ >> +static const struct s5k6aa_pixfmt s5k6aa_formats[] = { >> + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 }, >> + /* range 16-240 */ >> + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_REC709, 6 }, >> + { V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_JPEG, 0 }, >> +}; >> + >> +static const struct s5k6aa_interval s5k6aa_intervals[] = { >> + { 1000, {10000, 1000000}, {1280, 1024} }, /* 10 fps */ >> + { 666, {15000, 1000000}, {1280, 1024} }, /* 15 fps */ >> + { 500, {20000, 1000000}, {1280, 720} }, /* 20 fps */ >> + { 400, {25000, 1000000}, {640, 480} }, /* 25 fps */ >> + { 333, {33300, 1000000}, {640, 480} }, /* 30 fps */ >> +}; >> + >> +#define S5K6AA_INTERVAL_DEF_INDEX 1 /* 15 fps */ >> + >> +static struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl) >> +{ >> + return &container_of(ctrl->handler, struct s5k6aa, ctrls.handler)->sd; >> +} >> + >> +static struct s5k6aa *to_s5k6aa(struct v4l2_subdev *sd) >> +{ >> + return container_of(sd, struct s5k6aa, sd); >> +} >> + >> +/* Set initial values for all preview presets */ >> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, >> + int hflip, int vflip) >> +{ >> + struct s5k6aa_preset *preset = &s5k6aa->presets[0]; >> + int i; >> + >> + for (i = 0; i < S5K6AA_MAX_PRESETS; i++) { >> + preset->pixfmt = &s5k6aa_formats[0]; >> + preset->frame_rate_type = FR_RATE_DYNAMIC; >> + preset->inv_hflip = hflip; >> + preset->inv_vflip = vflip; >> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; >> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; >> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; >> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; >> + preset->in_win.left = 0; >> + preset->in_win.top = 0; > > Much of this data is static, why is it copied to the presets struct? > > What is the intended purpose of these presets? I agree there is no need to keep inv_hflip/inv_vflip there. It's more a leftover from previous driver version. I'll move it to struct s5k6aa. And I try to keep copy of each platform_data attribute in driver's private struct to make future transition to DT driver probing easier. inv_[hv]flip variables are used to indicate physical layout of the sensor, as it varies across multiple machines. So indeed they're global, not per the configuration set. Preset are there in the s5k6aafx register interface to allow fast transition between, for instance, low resolution preview and high resolution snapshot. I'm planning to use this driver as an experimental rabbit for the future snapshot mode API. in_win field is there for cropping support. So for now it's static data, but this will change. I've covered pretty much functionality of the device in this driver and I'd like to have it in mainline at this stage. I've spent pretty much time on this driver, trying to figure out some things on trial and error basis. > >> + preset->index = i; >> + preset++; >> + } >> + >> + s5k6aa->fiv = &s5k6aa_intervals[S5K6AA_INTERVAL_DEF_INDEX]; >> + s5k6aa->preset = &s5k6aa->presets[0]; >> +} >> + >> +static int s5k6aa_i2c_read(struct i2c_client *client, u16 addr, u16 *val) >> +{ >> + u8 wbuf[2] = {addr >> 8, addr & 0xFF}; >> + struct i2c_msg msg[2]; >> + u8 rbuf[2]; >> + int ret; >> + >> + msg[0].addr = client->addr; >> + msg[0].flags = 0; >> + msg[0].len = 2; >> + msg[0].buf = wbuf; >> + >> + msg[1].addr = client->addr; >> + msg[1].flags = I2C_M_RD; >> + msg[1].len = 2; >> + msg[1].buf = rbuf; >> + >> + ret = i2c_transfer(client->adapter, msg, 2); >> + *val = be16_to_cpu(*((u16 *)rbuf)); >> + >> + v4l2_dbg(3, debug, client, "i2c_read: 0x%04X : 0x%04x\n", addr, *val); >> + >> + return ret == 2 ? 0 : ret; >> +} >> + >> +static int s5k6aa_i2c_write(struct i2c_client *client, u16 addr, u16 val) >> +{ >> + u8 buf[4] = {addr >> 8, addr & 0xFF, val >> 8, val & 0xFF}; >> + >> + int ret = i2c_master_send(client, buf, 4); >> + v4l2_dbg(3, debug, client, "i2c_write: 0x%04X : 0x%04x\n", addr, val); >> + >> + return ret == 4 ? 0 : ret; >> +} >> + >> +/* The command register write, assumes Command_Wr_addH = 0x7000. */ >> +static int s5k6aa_write(struct i2c_client *c, u16 addr, u16 val) >> +{ >> + int ret = s5k6aa_i2c_write(c, REG_CMDWR_ADDRL, addr); >> + if (ret) >> + return ret; >> + return s5k6aa_i2c_write(c, REG_CMDBUF0_ADDR, val); >> +} >> + >> +/* The command register read, assumes Command_Rd_addH = 0x7000. */ >> +static int s5k6aa_read(struct i2c_client *client, u16 addr, u16 *val) >> +{ >> + int ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRL, addr); >> + if (ret) >> + return ret; >> + return s5k6aa_i2c_read(client, REG_CMDBUF0_ADDR, val); >> +} >> + >> +static int s5k6aa_write_array(struct v4l2_subdev *sd, >> + const struct s5k6aa_regval *msg) >> +{ >> + struct i2c_client *client = v4l2_get_subdevdata(sd); >> + u16 addr_incr = 0; >> + int ret = 0; >> + >> + while (msg->addr != S5K6AA_TERM) { >> + if (addr_incr != 2) >> + ret = s5k6aa_i2c_write(client, REG_CMDWR_ADDRL, >> + msg->addr); >> + if (ret) >> + break; >> + ret = s5k6aa_i2c_write(client, REG_CMDBUF0_ADDR, msg->val); >> + if (ret) >> + break; >> + /* Assume that msg->addr is always less than 0xfffc */ >> + addr_incr = (msg + 1)->addr - msg->addr; >> + msg++; >> + } >> + >> + return ret; >> +} >> + >> +/* Configure the AHB high address bytes for GTG registers access */ >> +static int s5k6aa_set_ahb_address(struct i2c_client *client) >> +{ >> + int ret = s5k6aa_i2c_write(client, AHB_MSB_ADDR_PTR, GEN_REG_OFFSH); >> + if (ret) >> + return ret; >> + ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRH, HOST_SWIF_OFFSH); >> + if (ret) >> + return ret; >> + return s5k6aa_i2c_write(client, REG_CMDWR_ADDRH, HOST_SWIF_OFFSH); >> +} >> + >> +/** >> + * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration >> + * >> + * Configure the internal ISP PLL for 24 MHz output frequency. >> + * Locking: called with s5k6aa->lock mutex held. >> + */ >> +static int s5k6aa_configure_pixel_clock(struct s5k6aa *s5k6aa) >> +{ >> + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); >> + unsigned long fmclk = s5k6aa->mclk_frequency / 1000; >> + int ret; >> + >> + if (WARN(fmclk < MIN_MCLK_FREQ_KHZ || fmclk > MAX_MCLK_FREQ_KHZ, >> + "Invalid clock frequency: %ld\n", fmclk)) >> + return -EINVAL; >> + >> + s5k6aa->clk_fop = 24000000U / 4000U; >> + s5k6aa->clk_fmin = 48000000U / 4000U; >> + s5k6aa->clk_fmax = 56000000U / 4000U; >> + >> + /* External input clock frequency in kHz */ >> + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_H, fmclk >> 16); >> + if (!ret) >> + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_L, fmclk & 0xFFFF); >> + if (!ret) >> + ret = s5k6aa_write(c, REG_I_USE_NPVI_CLOCKS, 1); >> + /* Internal PLL frequency */ >> + if (!ret) >> + ret = s5k6aa_write(c, REG_I_OPCLK_4KHZ(0), s5k6aa->clk_fop); >> + if (!ret) >> + ret = s5k6aa_write(c, REG_I_MIN_OUTRATE_4KHZ(0), >> + s5k6aa->clk_fmin); >> + if (!ret) >> + ret = s5k6aa_write(c, REG_I_MAX_OUTRATE_4KHZ(0), >> + s5k6aa->clk_fmax); >> + return ret ? ret : s5k6aa_write(c, REG_I_INIT_PARAMS_UPDATED, 1); >> +} >> + >> +/* Set horizontal and vertical image flipping */ >> +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) >> +{ >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >> + struct s5k6aa_preset *preset = s5k6aa->preset; >> + >> + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; >> + unsigned int hflip = horiz_flip ^ preset->inv_hflip; > > I don't see a need to store inv_hflip to presets. Instead, you might just > have a mirror bit in the platform data. Agreed, except I'd like to keep that in driver's private data structure, not to rely on the platform data after the driver probing. > >> + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), >> + hflip | (vflip << 1)); >> +} >> + ... >> + >> +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) >> +{ >> + int ret; >> + >> + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); >> + if (ret) >> + return ret; >> + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) >> + udelay(200); > > It's a small delay but still a busy loop. What about usleep_range() for the > same length? One could arque, but...yes, might make sense to change. > >> + >> + if (s5k6aa->s_power) >> + ret = s5k6aa->s_power(1); >> + usleep_range(4000, 4000); >> + >> + if (s5k6aa_gpio_deassert(s5k6aa, RST)) >> + msleep(20); >> + >> + return ret; >> +} >> + >> +static int __s5k6aa_power_disable(struct s5k6aa *s5k6aa) >> +{ >> + int ret; >> + >> + if (s5k6aa_gpio_assert(s5k6aa, RST)) >> + udelay(100); > > Same here. Would argue even more here, but will change too;) Best regards, -- Sylwester Nawrocki Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-23 10:12 ` Sylwester Nawrocki @ 2011-09-25 10:08 ` Sakari Ailus 2011-09-25 16:59 ` Sylwester Nawrocki 0 siblings, 1 reply; 19+ messages in thread From: Sakari Ailus @ 2011-09-25 10:08 UTC (permalink / raw) To: Sylwester Nawrocki Cc: linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: > Hi Sakari, Hi Sylwester, > On 09/23/2011 12:02 AM, Sakari Ailus wrote: > > Hi Sylwester, > > > > I have a few additional comments below, they don't depend on my earlier > > ones. > > Thanks a lot for your follow up review! > > > > > On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: > >> This driver exposes preview mode operation of the S5K6AAFX sensor with > >> embedded SoC ISP. It uses one of the five user predefined configuration > >> register sets. There is yet no support for capture (snapshot) operation. > >> Following controls are supported: > >> manual/auto exposure and gain, power line frequency (anti-flicker), > >> saturation, sharpness, brightness, contrast, white balance temperature, > >> color effects, horizontal/vertical image flip, frame interval. > >> > >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > >> --- > ... > >> + > >> +struct s5k6aa_pixfmt { > >> + enum v4l2_mbus_pixelcode code; > >> + u32 colorspace; > >> + /* REG_P_FMT(x) register value */ > >> + u16 reg_p_fmt; > >> +}; > >> + > >> +struct s5k6aa_preset { > >> + struct v4l2_frmsize_discrete out_size; > >> + struct v4l2_rect in_win; > >> + const struct s5k6aa_pixfmt *pixfmt; > >> + unsigned int inv_hflip:1; > >> + unsigned int inv_vflip:1; > >> + u8 frame_rate_type; > >> + u8 index; > >> +}; > >> + [clip] > >> +/* Set initial values for all preview presets */ > >> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, > >> + int hflip, int vflip) > >> +{ > >> + struct s5k6aa_preset *preset = &s5k6aa->presets[0]; > >> + int i; > >> + > >> + for (i = 0; i < S5K6AA_MAX_PRESETS; i++) { > >> + preset->pixfmt = &s5k6aa_formats[0]; > >> + preset->frame_rate_type = FR_RATE_DYNAMIC; > >> + preset->inv_hflip = hflip; > >> + preset->inv_vflip = vflip; > >> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; > >> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; > >> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; > >> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; > >> + preset->in_win.left = 0; > >> + preset->in_win.top = 0; > > > > Much of this data is static, why is it copied to the presets struct? > > > > What is the intended purpose of these presets? > > I agree there is no need to keep inv_hflip/inv_vflip there. It's more a > leftover from previous driver version. I'll move it to struct s5k6aa. > And I try to keep copy of each platform_data attribute in driver's > private struct to make future transition to DT driver probing easier. > > inv_[hv]flip variables are used to indicate physical layout of the sensor, > as it varies across multiple machines. So indeed they're global, not per > the configuration set. > > Preset are there in the s5k6aafx register interface to allow fast transition > between, for instance, low resolution preview and high resolution snapshot. > I'm planning to use this driver as an experimental rabbit for the future > snapshot mode API. It sounds like that a "snapshot mode" would be an use case that presets could support in a way, but what I'd really like to ask is how much advantage one can get by using this mode, say, vs. re-programming the same settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so I imagine a few tens of register writes can be avoided by most, taking somewhere in the range of a few milliseconds. I would rather measure and attempt to optimise the register writes in the driver first before adding complexity to user space interface. Or do the presets provide other advantages than just storing configurations? > in_win field is there for cropping support. So for now it's static data, > but this will change. I've covered pretty much functionality of the device > in this driver and I'd like to have it in mainline at this stage. > I've spent pretty much time on this driver, trying to figure out some > things on trial and error basis. > [clip] > >> + > >> +/* Set horizontal and vertical image flipping */ > >> +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) > >> +{ > >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > >> + struct s5k6aa_preset *preset = s5k6aa->preset; > >> + > >> + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; > >> + unsigned int hflip = horiz_flip ^ preset->inv_hflip; > > > > I don't see a need to store inv_hflip to presets. Instead, you might just > > have a mirror bit in the platform data. > > Agreed, except I'd like to keep that in driver's private data structure, > not to rely on the platform data after the driver probing. There's no reason to avoid using platform data after probing that I am aware of. > > > >> + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), > >> + hflip | (vflip << 1)); > >> +} > >> + > ... > >> + > >> +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) > >> +{ > >> + int ret; > >> + > >> + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > >> + if (ret) > >> + return ret; > >> + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) > >> + udelay(200); > > > > It's a small delay but still a busy loop. What about usleep_range() for the > > same length? > > One could arque, but...yes, might make sense to change. I guess it's up to how much time e.g. a task switch would take. These days 1 GHz and over CPUs might be able to do something useful during that time. :) Cheers, -- Sakari Ailus e-mail: sakari.ailus@iki.fi jabber/XMPP/Gmail: sailus@retiisi.org.uk ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-25 10:08 ` Sakari Ailus @ 2011-09-25 16:59 ` Sylwester Nawrocki 2011-09-27 20:55 ` Sakari Ailus 0 siblings, 1 reply; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-25 16:59 UTC (permalink / raw) To: Sakari Ailus Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Hello Sakari, On 09/25/2011 12:08 PM, Sakari Ailus wrote: > On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: >> On 09/23/2011 12:02 AM, Sakari Ailus wrote: >>> Hi Sylwester, >>> >>> I have a few additional comments below, they don't depend on my earlier >>> ones. >> >> Thanks a lot for your follow up review! >>> >>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: >>>> This driver exposes preview mode operation of the S5K6AAFX sensor with >>>> embedded SoC ISP. It uses one of the five user predefined configuration >>>> register sets. There is yet no support for capture (snapshot) operation. >>>> Following controls are supported: >>>> manual/auto exposure and gain, power line frequency (anti-flicker), >>>> saturation, sharpness, brightness, contrast, white balance temperature, >>>> color effects, horizontal/vertical image flip, frame interval. >>>> >>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >>>> --- >> ... >>>> + >>>> +struct s5k6aa_pixfmt { >>>> + enum v4l2_mbus_pixelcode code; >>>> + u32 colorspace; >>>> + /* REG_P_FMT(x) register value */ >>>> + u16 reg_p_fmt; >>>> +}; >>>> + >>>> +struct s5k6aa_preset { >>>> + struct v4l2_frmsize_discrete out_size; >>>> + struct v4l2_rect in_win; >>>> + const struct s5k6aa_pixfmt *pixfmt; >>>> + unsigned int inv_hflip:1; >>>> + unsigned int inv_vflip:1; >>>> + u8 frame_rate_type; >>>> + u8 index; >>>> +}; >>>> + > > [clip] > >>>> +/* Set initial values for all preview presets */ >>>> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, >>>> + int hflip, int vflip) >>>> +{ >>>> + struct s5k6aa_preset *preset =&s5k6aa->presets[0]; >>>> + int i; >>>> + >>>> + for (i = 0; i< S5K6AA_MAX_PRESETS; i++) { >>>> + preset->pixfmt =&s5k6aa_formats[0]; >>>> + preset->frame_rate_type = FR_RATE_DYNAMIC; >>>> + preset->inv_hflip = hflip; >>>> + preset->inv_vflip = vflip; >>>> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; >>>> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; >>>> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; >>>> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; >>>> + preset->in_win.left = 0; >>>> + preset->in_win.top = 0; >>> >>> Much of this data is static, why is it copied to the presets struct? >>> >>> What is the intended purpose of these presets? >> >> I agree there is no need to keep inv_hflip/inv_vflip there. It's more a >> leftover from previous driver version. I'll move it to struct s5k6aa. >> And I try to keep copy of each platform_data attribute in driver's >> private struct to make future transition to DT driver probing easier. >> >> inv_[hv]flip variables are used to indicate physical layout of the sensor, >> as it varies across multiple machines. So indeed they're global, not per >> the configuration set. >> >> Preset are there in the s5k6aafx register interface to allow fast transition >> between, for instance, low resolution preview and high resolution snapshot. >> I'm planning to use this driver as an experimental rabbit for the future >> snapshot mode API. > > It sounds like that a "snapshot mode" would be an use case that presets > could support in a way, but what I'd really like to ask is how much > advantage one can get by using this mode, say, vs. re-programming the same > settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so > I imagine a few tens of register writes can be avoided by most, taking > somewhere in the range of a few milliseconds. As far as the timings are concerned, for this particular device, the advantage is not really meaningful. We are talking about appr. 20 registers (~50 bytes on I2C bus), which is a ridiculously low number. However, even if the interface isn't exposed to user space, in the hardware there exist separate registers for preview and (still) capture and it makes much sense in the driver to model this, for easier device control. Anyway, I've taken a closer look at what I need in the single user configuration set data structure and reworked the driver quite extensively. Should post that in the coming week, unless some unexpected disasters occur;) Do you see any problem in defining real still capture interface in V4L ? It's probably just a small set of new controls, new capability, plus multi-size buffer queue Guennadi has been working on. Some devices will require explicitly switching between preview and capture mode, and it may make difference if they are programmed in advance or on demand. If the hardware (or it's firmware) supports something natively why should we go for a less efficient SW emulated replacement? After all, preview and capture mode seem pretty basic features that applications will want to use. > > I would rather measure and attempt to optimise the register writes in the > driver first before adding complexity to user space interface. Yeah, I'm not planning to use the presets plainly for different user configurations, just trying to design the driver so those may be utilised for the device various operation modes. > > Or do the presets provide other advantages than just storing configurations? The H/W requires different register sets for preview and capture. For instance only in the capture mode the flash control is performed. So it's important to know whether we start in preview or capture mode, and these modes have distinct registers for resolution setup, etc. As a side note, I'm not highly interested in supporting snapshot mode with S5K6AAFX. The M-5MOLS sensor is a better target for this, for instance. > > [clip] > >>>> + >>>> +/* Set horizontal and vertical image flipping */ >>>> +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) >>>> +{ >>>> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >>>> + struct s5k6aa_preset *preset = s5k6aa->preset; >>>> + >>>> + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; >>>> + unsigned int hflip = horiz_flip ^ preset->inv_hflip; >>> >>> I don't see a need to store inv_hflip to presets. Instead, you might just >>> have a mirror bit in the platform data. >> >> Agreed, except I'd like to keep that in driver's private data structure, >> not to rely on the platform data after the driver probing. > > There's no reason to avoid using platform data after probing that I am aware > of. What I meant was that for DT enabled systems you won't have the platform data at all. Instead you parse the properties, that were so far being passed in platform data struct, from struct device_node (dev.of_node) in driver's probe(). So, in order to make things less complicated for DT probing case, I just put all the properties in driver's private struct, not relying on any dereferencing of the platform data. Which I know in advance may not exist in some cases. For non-DT systems the attributes are copied from platform data and for DT-enabled ones they will be retrieved from DT in probe(). Except that the driver behaves identical regardless of the way the device was created. This is really just a prerequisite, still there is quite a few unresolved issues, like set_power/ clock callbacks into platform code. Different topic is the design of the v4l2/media devices bindings. As it has been already roughly discussed, we probably need a root DT node at the level of nowadays media device. So various initialization dependencies between media entities (host dev./subdevs) can be satisfied. This, at least, was my understanding. > >>> >>>> + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), >>>> + hflip | (vflip<< 1)); >>>> +} >>>> + >> ... >>>> + >>>> +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) >>>> +{ >>>> + int ret; >>>> + >>>> + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); >>>> + if (ret) >>>> + return ret; >>>> + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) >>>> + udelay(200); >>> >>> It's a small delay but still a busy loop. What about usleep_range() for the >>> same length? >> >> One could arque, but...yes, might make sense to change. > > I guess it's up to how much time e.g. a task switch would take. These days 1 > GHz and over CPUs might be able to do something useful during that time. :) Yes, the context switch, involving caches invalidation, might take some time. I have never really measured that though. Also an overhead of setting up the high resolution timer for usleep_range() should be considered. Nevertheless Documentation/timers-howto.txt recommends using udelay only up to 10 us delays. So for 100..200 us it seems better to stick with usleep_range(). -- Regards, Sylwester ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-25 16:59 ` Sylwester Nawrocki @ 2011-09-27 20:55 ` Sakari Ailus 2011-09-27 20:58 ` Sakari Ailus 2011-10-01 9:17 ` Sylwester Nawrocki 0 siblings, 2 replies; 19+ messages in thread From: Sakari Ailus @ 2011-09-27 20:55 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Sylwester Nawrocki wrote: > Hello Sakari, Hi Sylwester, > On 09/25/2011 12:08 PM, Sakari Ailus wrote: >> On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: >>> On 09/23/2011 12:02 AM, Sakari Ailus wrote: >>>> Hi Sylwester, >>>> >>>> I have a few additional comments below, they don't depend on my earlier >>>> ones. >>> >>> Thanks a lot for your follow up review! >>>> >>>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: >>>>> This driver exposes preview mode operation of the S5K6AAFX sensor with >>>>> embedded SoC ISP. It uses one of the five user predefined configuration >>>>> register sets. There is yet no support for capture (snapshot) operation. >>>>> Following controls are supported: >>>>> manual/auto exposure and gain, power line frequency (anti-flicker), >>>>> saturation, sharpness, brightness, contrast, white balance temperature, >>>>> color effects, horizontal/vertical image flip, frame interval. >>>>> >>>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >>>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >>>>> --- >>> ... >>>>> + >>>>> +struct s5k6aa_pixfmt { >>>>> + enum v4l2_mbus_pixelcode code; >>>>> + u32 colorspace; >>>>> + /* REG_P_FMT(x) register value */ >>>>> + u16 reg_p_fmt; >>>>> +}; >>>>> + >>>>> +struct s5k6aa_preset { >>>>> + struct v4l2_frmsize_discrete out_size; >>>>> + struct v4l2_rect in_win; >>>>> + const struct s5k6aa_pixfmt *pixfmt; >>>>> + unsigned int inv_hflip:1; >>>>> + unsigned int inv_vflip:1; >>>>> + u8 frame_rate_type; >>>>> + u8 index; >>>>> +}; >>>>> + >> >> [clip] >> >>>>> +/* Set initial values for all preview presets */ >>>>> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, >>>>> + int hflip, int vflip) >>>>> +{ >>>>> + struct s5k6aa_preset *preset =&s5k6aa->presets[0]; >>>>> + int i; >>>>> + >>>>> + for (i = 0; i< S5K6AA_MAX_PRESETS; i++) { >>>>> + preset->pixfmt =&s5k6aa_formats[0]; >>>>> + preset->frame_rate_type = FR_RATE_DYNAMIC; >>>>> + preset->inv_hflip = hflip; >>>>> + preset->inv_vflip = vflip; >>>>> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; >>>>> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; >>>>> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; >>>>> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; >>>>> + preset->in_win.left = 0; >>>>> + preset->in_win.top = 0; >>>> >>>> Much of this data is static, why is it copied to the presets struct? >>>> >>>> What is the intended purpose of these presets? >>> >>> I agree there is no need to keep inv_hflip/inv_vflip there. It's more a >>> leftover from previous driver version. I'll move it to struct s5k6aa. >>> And I try to keep copy of each platform_data attribute in driver's >>> private struct to make future transition to DT driver probing easier. >>> >>> inv_[hv]flip variables are used to indicate physical layout of the sensor, >>> as it varies across multiple machines. So indeed they're global, not per >>> the configuration set. >>> >>> Preset are there in the s5k6aafx register interface to allow fast transition >>> between, for instance, low resolution preview and high resolution snapshot. >>> I'm planning to use this driver as an experimental rabbit for the future >>> snapshot mode API. >> >> It sounds like that a "snapshot mode" would be an use case that presets >> could support in a way, but what I'd really like to ask is how much >> advantage one can get by using this mode, say, vs. re-programming the same >> settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so >> I imagine a few tens of register writes can be avoided by most, taking >> somewhere in the range of a few milliseconds. > > As far as the timings are concerned, for this particular device, the > advantage is not really meaningful. We are talking about appr. 20 > registers (~50 bytes on I2C bus), which is a ridiculously low number. > However, even if the interface isn't exposed to user space, in the > hardware there exist separate registers for preview and (still) capture > and it makes much sense in the driver to model this, for easier device > control. How do you know when to switch the preset if you don't expose this to the user space? I'm not sure if this makes it easier for the user space. The user space must know about such a think and aslo which parameters it applies to. I don't think this ocnforms to V4L2 either, but I might have misunderstood something. > Anyway, I've taken a closer look at what I need in the single user > configuration set data structure and reworked the driver quite > extensively. Should post that in the coming week, unless some unexpected > disasters occur;) > > Do you see any problem in defining real still capture interface in V4L ? > It's probably just a small set of new controls, new capability, plus > multi-size buffer queue Guennadi has been working on. Some devices will > require explicitly switching between preview and capture mode, and it may > make difference if they are programmed in advance or on demand. I don't think V4L2 should have a still capture interface. Still capture is just one use case as viewfinder and video. V4L2 deals with frames, formats and parameters that are all generic and use case independent. Instead of use cases, we have independent configurable settings and that's the way I think it should stay. If your hardware requires switching mode to "still" before taking a still image, then the driver should expose this functionality as such. I'd be really wary of e.g. exposing register configuration flipping to user space even if the driver can do that. > If the hardware (or it's firmware) supports something natively why should > we go for a less efficient SW emulated replacement? After all, preview and > capture mode seem pretty basic features that applications will want to > use. I think it depends on an application. If your application only knows it wants to do "viewfinder" or "capture" then it might be V4L2 could be a too low level interface for that job. I might suggest GSTphotography instead. >> I would rather measure and attempt to optimise the register writes in the >> driver first before adding complexity to user space interface. > > Yeah, I'm not planning to use the presets plainly for different user > configurations, just trying to design the driver so those may be utilised > for the device various operation modes. > >> >> Or do the presets provide other advantages than just storing configurations? > > The H/W requires different register sets for preview and capture. For > instance only in the capture mode the flash control is performed. So it's > important to know whether we start in preview or capture mode, and these > modes have distinct registers for resolution setup, etc. As a side note, > I'm not highly interested in supporting snapshot mode with S5K6AAFX. The > M-5MOLS sensor is a better target for this, for instance. As far as I understand, the M-5MOLS indeed needs to know it's capturing a still image. Raw non-smart sensors, however, don't even recognise such a concept. >> [clip] >> >>>>> + >>>>> +/* Set horizontal and vertical image flipping */ >>>>> +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) >>>>> +{ >>>>> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >>>>> + struct s5k6aa_preset *preset = s5k6aa->preset; >>>>> + >>>>> + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; >>>>> + unsigned int hflip = horiz_flip ^ preset->inv_hflip; >>>> >>>> I don't see a need to store inv_hflip to presets. Instead, you might just >>>> have a mirror bit in the platform data. >>> >>> Agreed, except I'd like to keep that in driver's private data structure, >>> not to rely on the platform data after the driver probing. >> >> There's no reason to avoid using platform data after probing that I am aware >> of. > > What I meant was that for DT enabled systems you won't have the platform > data at all. Instead you parse the properties, that were so far being > passed in platform data struct, from struct device_node (dev.of_node) in > driver's probe(). So, in order to make things less complicated for DT > probing case, I just put all the properties in driver's private struct, > not relying on any dereferencing of the platform data. Which I know in > advance may not exist in some cases. For non-DT systems the attributes are > copied from platform data and for DT-enabled ones they will be retrieved > from DT in probe(). Except that the driver behaves identical regardless of > the way the device was created. This is really just a prerequisite, still > there is quite a few unresolved issues, like set_power/ clock callbacks > into platform code. Thanks for reminding me. I'd almost forgotten the device tree for a moment. ;) > Different topic is the design of the v4l2/media devices bindings. As it has been > already roughly discussed, we probably need a root DT node at the level of > nowadays media device. So various initialization dependencies between media > entities (host dev./subdevs) can be satisfied. This, at least, was my > understanding. Sounds good to me. -- Sakari Ailus sakari.ailus@iki.fi ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-27 20:55 ` Sakari Ailus @ 2011-09-27 20:58 ` Sakari Ailus 2011-09-28 7:50 ` Sylwester Nawrocki 2011-10-01 9:17 ` Sylwester Nawrocki 1 sibling, 1 reply; 19+ messages in thread From: Sakari Ailus @ 2011-09-27 20:58 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim On Tue, Sep 27, 2011 at 11:55:32PM +0300, Sakari Ailus wrote: > Sylwester Nawrocki wrote: > > Hello Sakari, > > Hi Sylwester, What I forgot to ask was whether there is a public datasheet for this sensor? Regards, -- Sakari Ailus e-mail: sakari.ailus@iki.fi jabber/XMPP/Gmail: sailus@retiisi.org.uk ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-27 20:58 ` Sakari Ailus @ 2011-09-28 7:50 ` Sylwester Nawrocki 0 siblings, 0 replies; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-28 7:50 UTC (permalink / raw) To: Sakari Ailus Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Hi Sakari, On 09/27/2011 10:58 PM, Sakari Ailus wrote: > On Tue, Sep 27, 2011 at 11:55:32PM +0300, Sakari Ailus wrote: >> Sylwester Nawrocki wrote: >>> Hello Sakari, >> >> Hi Sylwester, > > What I forgot to ask was whether there is a public datasheet for this > sensor? Unfortunately I'm not aware of any official website where you could get it. AFAIK some related materials are available on http://www.aesop.or.kr And, Google should have something to tell you about that too;) >From what I can see all the now publicly available documentation is slightly outdated and less complete. Regards, -- Sylwester Nawrocki Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-27 20:55 ` Sakari Ailus 2011-09-27 20:58 ` Sakari Ailus @ 2011-10-01 9:17 ` Sylwester Nawrocki 2011-10-02 7:20 ` Sakari Ailus 1 sibling, 1 reply; 19+ messages in thread From: Sylwester Nawrocki @ 2011-10-01 9:17 UTC (permalink / raw) To: Sakari Ailus Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Hi Sakari, I'm sorry, I've been a little bit busy in the week to get back to this. On 09/27/2011 10:55 PM, Sakari Ailus wrote: > Sylwester Nawrocki wrote: >> On 09/25/2011 12:08 PM, Sakari Ailus wrote: >>> On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: >>>> On 09/23/2011 12:02 AM, Sakari Ailus wrote: >>>>> Hi Sylwester, >>>>> >>>>> I have a few additional comments below, they don't depend on my earlier >>>>> ones. >>>> >>>> Thanks a lot for your follow up review! >>>>> >>>>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: >>>>>> This driver exposes preview mode operation of the S5K6AAFX sensor with >>>>>> embedded SoC ISP. It uses one of the five user predefined configuration >>>>>> register sets. There is yet no support for capture (snapshot) operation. >>>>>> Following controls are supported: >>>>>> manual/auto exposure and gain, power line frequency (anti-flicker), >>>>>> saturation, sharpness, brightness, contrast, white balance temperature, >>>>>> color effects, horizontal/vertical image flip, frame interval. >>>>>> >>>>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >>>>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >>>>>> --- >>>> ... >>>>>> + >>>>>> +struct s5k6aa_pixfmt { >>>>>> + enum v4l2_mbus_pixelcode code; >>>>>> + u32 colorspace; >>>>>> + /* REG_P_FMT(x) register value */ >>>>>> + u16 reg_p_fmt; >>>>>> +}; >>>>>> + >>>>>> +struct s5k6aa_preset { >>>>>> + struct v4l2_frmsize_discrete out_size; >>>>>> + struct v4l2_rect in_win; >>>>>> + const struct s5k6aa_pixfmt *pixfmt; >>>>>> + unsigned int inv_hflip:1; >>>>>> + unsigned int inv_vflip:1; >>>>>> + u8 frame_rate_type; >>>>>> + u8 index; >>>>>> +}; >>>>>> + >>> >>> [clip] >>> >>>>>> +/* Set initial values for all preview presets */ >>>>>> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, >>>>>> + int hflip, int vflip) >>>>>> +{ >>>>>> + struct s5k6aa_preset *preset =&s5k6aa->presets[0]; >>>>>> + int i; >>>>>> + >>>>>> + for (i = 0; i< S5K6AA_MAX_PRESETS; i++) { >>>>>> + preset->pixfmt =&s5k6aa_formats[0]; >>>>>> + preset->frame_rate_type = FR_RATE_DYNAMIC; >>>>>> + preset->inv_hflip = hflip; >>>>>> + preset->inv_vflip = vflip; >>>>>> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; >>>>>> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; >>>>>> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; >>>>>> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; >>>>>> + preset->in_win.left = 0; >>>>>> + preset->in_win.top = 0; >>>>> >>>>> Much of this data is static, why is it copied to the presets struct? >>>>> >>>>> What is the intended purpose of these presets? >>>> >>>> I agree there is no need to keep inv_hflip/inv_vflip there. It's more a >>>> leftover from previous driver version. I'll move it to struct s5k6aa. >>>> And I try to keep copy of each platform_data attribute in driver's >>>> private struct to make future transition to DT driver probing easier. >>>> >>>> inv_[hv]flip variables are used to indicate physical layout of the sensor, >>>> as it varies across multiple machines. So indeed they're global, not per >>>> the configuration set. >>>> >>>> Preset are there in the s5k6aafx register interface to allow fast transition >>>> between, for instance, low resolution preview and high resolution snapshot. >>>> I'm planning to use this driver as an experimental rabbit for the future >>>> snapshot mode API. >>> >>> It sounds like that a "snapshot mode" would be an use case that presets >>> could support in a way, but what I'd really like to ask is how much >>> advantage one can get by using this mode, say, vs. re-programming the same >>> settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so >>> I imagine a few tens of register writes can be avoided by most, taking >>> somewhere in the range of a few milliseconds. >> >> As far as the timings are concerned, for this particular device, the >> advantage is not really meaningful. We are talking about appr. 20 >> registers (~50 bytes on I2C bus), which is a ridiculously low number. >> However, even if the interface isn't exposed to user space, in the >> hardware there exist separate registers for preview and (still) capture >> and it makes much sense in the driver to model this, for easier device >> control. > > How do you know when to switch the preset if you don't expose this to the > user space? I don't, the user configuration data structure is there in the driver to more precisely reflect the control interface of the device and better understand what this driver supports and what it doesn't. Even if I use only one user configuration register set _internally_ in the driver, there must be some information provided to the device associated with it, like which user config set we use, which clocks configuration applies to it, etc. Please don't make me converting this driver to a total mess. :) > > I'm not sure if this makes it easier for the user space. The user space must > know about such a think and aslo which parameters it applies to. I don't Yes, I agree on this entirely. > think this ocnforms to V4L2 either, but I might have misunderstood > something. If there is anything in the code not conforming to V4L2 please indicate it clearly. > >> Anyway, I've taken a closer look at what I need in the single user >> configuration set data structure and reworked the driver quite >> extensively. Should post that in the coming week, unless some unexpected >> disasters occur;) >> >> Do you see any problem in defining real still capture interface in V4L ? >> It's probably just a small set of new controls, new capability, plus >> multi-size buffer queue Guennadi has been working on. Some devices will >> require explicitly switching between preview and capture mode, and it may >> make difference if they are programmed in advance or on demand. > > I don't think V4L2 should have a still capture interface. Still capture is > just one use case as viewfinder and video. V4L2 deals with frames, formats > and parameters that are all generic and use case independent. Instead of use > cases, we have independent configurable settings and that's the way I think > it should stay. > > If your hardware requires switching mode to "still" before taking a still > image, then the driver should expose this functionality as such. I'd be Yeah, of course this should work. But I don't quite see how would I expose the "still"/"normal" switch control with existing API. Aren't you going to blackball this as just another 'use case' ? :) In fact preview/still mode control seems to be a minimum needed to expose full functionality of the S5K6AAFX device in V4L2 API. But I am not really interested in "still" capture with this device ATM. The current driver is more than enough :) > really wary of e.g. exposing register configuration flipping to user space > even if the driver can do that. Nor do I intend to make such attempts in the future, neither there is anything like this in my driver. > >> If the hardware (or it's firmware) supports something natively why should >> we go for a less efficient SW emulated replacement? After all, preview and >> capture mode seem pretty basic features that applications will want to >> use. > > I think it depends on an application. If your application only knows it > wants to do "viewfinder" or "capture" then it might be V4L2 could be a too > low level interface for that job. Sorry, this is all not about the applications capabilities. Only about the V4L2 API limitations in using the existing devices. > > I might suggest GSTphotography instead. GstPhotography is not really impressive in its current state: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-plugins/html/GstPhotography.html It still belongs to the Bad Plugins group, right ? Although I am not an OpenMAX advocate, it seems top have a better defined interface (chapter 8.9.1). http://www.khronos.org/registry/omxil/specs/OpenMAX_IL_1_1_2_Specification.pdf > >>> I would rather measure and attempt to optimise the register writes in the >>> driver first before adding complexity to user space interface. >> >> Yeah, I'm not planning to use the presets plainly for different user >> configurations, just trying to design the driver so those may be utilised >> for the device various operation modes. >> >>> >>> Or do the presets provide other advantages than just storing configurations? >> >> The H/W requires different register sets for preview and capture. For >> instance only in the capture mode the flash control is performed. So it's >> important to know whether we start in preview or capture mode, and these >> modes have distinct registers for resolution setup, etc. As a side note, >> I'm not highly interested in supporting snapshot mode with S5K6AAFX. The >> M-5MOLS sensor is a better target for this, for instance. > > As far as I understand, the M-5MOLS indeed needs to know it's capturing a > still image. Raw non-smart sensors, however, don't even recognise such a > concept. Yes. Although the world is not all made of raw ("non-smart") sensor + local SoC ISP configurations. -- Regards, Sylwester ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-10-01 9:17 ` Sylwester Nawrocki @ 2011-10-02 7:20 ` Sakari Ailus 2011-10-03 8:33 ` Laurent Pinchart 2011-10-06 20:00 ` Sylwester Nawrocki 0 siblings, 2 replies; 19+ messages in thread From: Sakari Ailus @ 2011-10-02 7:20 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim On Sat, Oct 01, 2011 at 11:17:27AM +0200, Sylwester Nawrocki wrote: > Hi Sakari, > > I'm sorry, I've been a little bit busy in the week to get back to this. Hi Sylwester, No worries! > On 09/27/2011 10:55 PM, Sakari Ailus wrote: > > Sylwester Nawrocki wrote: > >> On 09/25/2011 12:08 PM, Sakari Ailus wrote: > >>> On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: > >>>> On 09/23/2011 12:02 AM, Sakari Ailus wrote: > >>>>> Hi Sylwester, > >>>>> > >>>>> I have a few additional comments below, they don't depend on my earlier > >>>>> ones. > >>>> > >>>> Thanks a lot for your follow up review! > >>>>> > >>>>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: > >>>>>> This driver exposes preview mode operation of the S5K6AAFX sensor with > >>>>>> embedded SoC ISP. It uses one of the five user predefined configuration > >>>>>> register sets. There is yet no support for capture (snapshot) operation. > >>>>>> Following controls are supported: > >>>>>> manual/auto exposure and gain, power line frequency (anti-flicker), > >>>>>> saturation, sharpness, brightness, contrast, white balance temperature, > >>>>>> color effects, horizontal/vertical image flip, frame interval. > >>>>>> > >>>>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> > >>>>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> > >>>>>> --- > >>>> ... > >>>>>> + > >>>>>> +struct s5k6aa_pixfmt { > >>>>>> + enum v4l2_mbus_pixelcode code; > >>>>>> + u32 colorspace; > >>>>>> + /* REG_P_FMT(x) register value */ > >>>>>> + u16 reg_p_fmt; > >>>>>> +}; > >>>>>> + > >>>>>> +struct s5k6aa_preset { > >>>>>> + struct v4l2_frmsize_discrete out_size; > >>>>>> + struct v4l2_rect in_win; > >>>>>> + const struct s5k6aa_pixfmt *pixfmt; > >>>>>> + unsigned int inv_hflip:1; > >>>>>> + unsigned int inv_vflip:1; > >>>>>> + u8 frame_rate_type; > >>>>>> + u8 index; > >>>>>> +}; > >>>>>> + > >>> > >>> [clip] > >>> > >>>>>> +/* Set initial values for all preview presets */ > >>>>>> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, > >>>>>> + int hflip, int vflip) > >>>>>> +{ > >>>>>> + struct s5k6aa_preset *preset =&s5k6aa->presets[0]; > >>>>>> + int i; > >>>>>> + > >>>>>> + for (i = 0; i< S5K6AA_MAX_PRESETS; i++) { > >>>>>> + preset->pixfmt =&s5k6aa_formats[0]; > >>>>>> + preset->frame_rate_type = FR_RATE_DYNAMIC; > >>>>>> + preset->inv_hflip = hflip; > >>>>>> + preset->inv_vflip = vflip; > >>>>>> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; > >>>>>> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; > >>>>>> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; > >>>>>> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; > >>>>>> + preset->in_win.left = 0; > >>>>>> + preset->in_win.top = 0; > >>>>> > >>>>> Much of this data is static, why is it copied to the presets struct? > >>>>> > >>>>> What is the intended purpose of these presets? > >>>> > >>>> I agree there is no need to keep inv_hflip/inv_vflip there. It's more a > >>>> leftover from previous driver version. I'll move it to struct s5k6aa. > >>>> And I try to keep copy of each platform_data attribute in driver's > >>>> private struct to make future transition to DT driver probing easier. > >>>> > >>>> inv_[hv]flip variables are used to indicate physical layout of the sensor, > >>>> as it varies across multiple machines. So indeed they're global, not per > >>>> the configuration set. > >>>> > >>>> Preset are there in the s5k6aafx register interface to allow fast transition > >>>> between, for instance, low resolution preview and high resolution snapshot. > >>>> I'm planning to use this driver as an experimental rabbit for the future > >>>> snapshot mode API. > >>> > >>> It sounds like that a "snapshot mode" would be an use case that presets > >>> could support in a way, but what I'd really like to ask is how much > >>> advantage one can get by using this mode, say, vs. re-programming the same > >>> settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so > >>> I imagine a few tens of register writes can be avoided by most, taking > >>> somewhere in the range of a few milliseconds. > >> > >> As far as the timings are concerned, for this particular device, the > >> advantage is not really meaningful. We are talking about appr. 20 > >> registers (~50 bytes on I2C bus), which is a ridiculously low number. > >> However, even if the interface isn't exposed to user space, in the > >> hardware there exist separate registers for preview and (still) capture > >> and it makes much sense in the driver to model this, for easier device > >> control. > > > > How do you know when to switch the preset if you don't expose this to the > > user space? > > I don't, the user configuration data structure is there in the driver to more > precisely reflect the control interface of the device and better understand > what this driver supports and what it doesn't. Even if I use only one user > configuration register set _internally_ in the driver, there must be some > information provided to the device associated with it, like which user config > set we use, which clocks configuration applies to it, etc. Please don't make > me converting this driver to a total mess. :) :) Indeed. After reading the patch 4th time, I realised there's just one preset supported right now. I found a relatively decent datasheet, too. > > I'm not sure if this makes it easier for the user space. The user space must > > know about such a think and aslo which parameters it applies to. I don't > > Yes, I agree on this entirely. > > > think this ocnforms to V4L2 either, but I might have misunderstood > > something. > > If there is anything in the code not conforming to V4L2 please indicate it > clearly. Ok, what the driver currently implements, does conform to V4L2. But getting advantage (which I'd like to argue might be irrelevant) using different presets would be challenging to implement while obeying the V4L2 spec. > >> Anyway, I've taken a closer look at what I need in the single user > >> configuration set data structure and reworked the driver quite > >> extensively. Should post that in the coming week, unless some unexpected > >> disasters occur;) > >> > >> Do you see any problem in defining real still capture interface in V4L ? > >> It's probably just a small set of new controls, new capability, plus > >> multi-size buffer queue Guennadi has been working on. Some devices will > >> require explicitly switching between preview and capture mode, and it may > >> make difference if they are programmed in advance or on demand. > > > > I don't think V4L2 should have a still capture interface. Still capture is > > just one use case as viewfinder and video. V4L2 deals with frames, formats > > and parameters that are all generic and use case independent. Instead of use > > cases, we have independent configurable settings and that's the way I think > > it should stay. > > > > If your hardware requires switching mode to "still" before taking a still > > image, then the driver should expose this functionality as such. I'd be > > Yeah, of course this should work. But I don't quite see how would I expose the > "still"/"normal" switch control with existing API. Aren't you going to blackball > this as just another 'use case' ? :) That's fine because it's implemented by the sensor already. My point is that we should only show this fact in V4L2 API as little as possible. I remember Guennadi had sensors which provide something called "snapshot mode". A single boolean control to turn this on or off would suffice --- snapshot mode is something that's going to be discussed in the Multimedia summit if my memory serves me right. This could be one option for this sensor as well but the implementation might not be quite optimal since you'd still need to switch the configuration. > In fact preview/still mode control seems to be a minimum needed to expose full > functionality of the S5K6AAFX device in V4L2 API. But I am not really interested > in "still" capture with this device ATM. The current driver is more than enough :) > > > really wary of e.g. exposing register configuration flipping to user space > > even if the driver can do that. > > Nor do I intend to make such attempts in the future, neither there is anything > like this in my driver. Ack. > >> If the hardware (or it's firmware) supports something natively why should > >> we go for a less efficient SW emulated replacement? After all, preview and > >> capture mode seem pretty basic features that applications will want to > >> use. > > > > I think it depends on an application. If your application only knows it > > wants to do "viewfinder" or "capture" then it might be V4L2 could be a too > > low level interface for that job. > > Sorry, this is all not about the applications capabilities. Only about the V4L2 API > limitations in using the existing devices. > > > > > I might suggest GSTphotography instead. > > GstPhotography is not really impressive in its current state: > http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-plugins/html/GstPhotography.html I'm probably not the best person to comment on this, but do you think something is e.g. either missing or should be implemented differently? > It still belongs to the Bad Plugins group, right ? That's right. > Although I am not an OpenMAX advocate, it seems top have a better defined interface > (chapter 8.9.1). > http://www.khronos.org/registry/omxil/specs/OpenMAX_IL_1_1_2_Specification.pdf > > > > >>> I would rather measure and attempt to optimise the register writes in the > >>> driver first before adding complexity to user space interface. > >> > >> Yeah, I'm not planning to use the presets plainly for different user > >> configurations, just trying to design the driver so those may be utilised > >> for the device various operation modes. > >> > >>> > >>> Or do the presets provide other advantages than just storing configurations? > >> > >> The H/W requires different register sets for preview and capture. For > >> instance only in the capture mode the flash control is performed. So it's > >> important to know whether we start in preview or capture mode, and these > >> modes have distinct registers for resolution setup, etc. As a side note, > >> I'm not highly interested in supporting snapshot mode with S5K6AAFX. The > >> M-5MOLS sensor is a better target for this, for instance. > > > > As far as I understand, the M-5MOLS indeed needs to know it's capturing a > > still image. Raw non-smart sensors, however, don't even recognise such a > > concept. > > Yes. Although the world is not all made of raw ("non-smart") sensor > + local SoC ISP configurations. I intended to refer to that as an example only. -- Sakari Ailus e-mail: sakari.ailus@iki.fi jabber/XMPP/Gmail: sailus@retiisi.org.uk ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-10-02 7:20 ` Sakari Ailus @ 2011-10-03 8:33 ` Laurent Pinchart 2011-10-06 20:00 ` Sylwester Nawrocki 1 sibling, 0 replies; 19+ messages in thread From: Laurent Pinchart @ 2011-10-03 8:33 UTC (permalink / raw) To: Sakari Ailus Cc: Sylwester Nawrocki, Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, sw0312.kim, riverful.kim Hi Sylwester and Sakari, On Sunday 02 October 2011 09:20:11 Sakari Ailus wrote: > On Sat, Oct 01, 2011 at 11:17:27AM +0200, Sylwester Nawrocki wrote: > > On 09/27/2011 10:55 PM, Sakari Ailus wrote: > > > Sylwester Nawrocki wrote: > > >> On 09/25/2011 12:08 PM, Sakari Ailus wrote: > > >>> On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: > > >>>> On 09/23/2011 12:02 AM, Sakari Ailus wrote: > > >>>>> Hi Sylwester, > > >>>>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: [snip] > > > I'm not sure if this makes it easier for the user space. The user space > > > must know about such a think and aslo which parameters it applies to. > > > I don't > > > > Yes, I agree on this entirely. > > > > > think this ocnforms to V4L2 either, but I might have misunderstood > > > something. > > > > If there is anything in the code not conforming to V4L2 please indicate > > it clearly. > > Ok, what the driver currently implements, does conform to V4L2. But getting > advantage (which I'd like to argue might be irrelevant) using different > presets would be challenging to implement while obeying the V4L2 spec. That's why we probably need to extend the V4L2 spec :-) "Snapshot" mode is currently ill-defined. At the hardware level, the name is used to describe different concepts depending on the sensor. This can cover a wide range of features, from enabling external trigger to using different register sets. Some of those features (such as registers set) are even not restricted to preview/snapshot/capture modes and can be used for other purpose. At the application level, capturing a snapshot image usually involve much more than just selecting a snapshot mode, especially when ISPs (either on the sensor side or on the host side) are involved. Snapshot mode will be discussed in Prague. Given the complexity of the issue we won't solve it there, but I hope to at least gather a list of requirements and use cases (and if possible a list that everybody agrees on :-)). It would be nice if every person interested in the subject could prepare such a list beforehand, as we will have little time to discuss the topic. > > >> Anyway, I've taken a closer look at what I need in the single user > > >> configuration set data structure and reworked the driver quite > > >> extensively. Should post that in the coming week, unless some > > >> unexpected disasters occur;) > > >> > > >> Do you see any problem in defining real still capture interface in V4L > > >> ? It's probably just a small set of new controls, new capability, > > >> plus multi-size buffer queue Guennadi has been working on. Some > > >> devices will require explicitly switching between preview and capture > > >> mode, and it may make difference if they are programmed in advance or > > >> on demand. For this specific use case, it's probably "just" that. If we take other use cases into account, it isn't. I don't think we should rush in API support for snapshot capture mode in V4L2 without a proper understanding of all (or most) use cases. > > > I don't think V4L2 should have a still capture interface. Still capture > > > is just one use case as viewfinder and video. V4L2 deals with frames, > > > formats and parameters that are all generic and use case independent. > > > Instead of use cases, we have independent configurable settings and > > > that's the way I think it should stay. > > > > > > If your hardware requires switching mode to "still" before taking a > > > still image, then the driver should expose this functionality as such. > > > I'd be > > > > Yeah, of course this should work. But I don't quite see how would I > > expose the "still"/"normal" switch control with existing API. Aren't you > > going to blackball this as just another 'use case' ? :) > > That's fine because it's implemented by the sensor already. My point is > that we should only show this fact in V4L2 API as little as possible. I agree with Sakari here. We need a high level snapshot capture API in userspace, something similar to (and not necessarily separate from) GstPhotography. The userspace components will of course need proper support from V4L2, but that doesn't mean the whole snapshot capture API must be implemented in V4L2. I see this more like a collection of V4L2 extensions (such as the multi-size buffer queue) that can be used to support snapshot capture in userspace. > I remember Guennadi had sensors which provide something called "snapshot > mode". A single boolean control to turn this on or off would suffice --- > snapshot mode is something that's going to be discussed in the Multimedia > summit if my memory serves me right. > > This could be one option for this sensor as well but the implementation > might not be quite optimal since you'd still need to switch the > configuration. > > > In fact preview/still mode control seems to be a minimum needed to expose > > full functionality of the S5K6AAFX device in V4L2 API. But I am not > > really interested in "still" capture with this device ATM. The current > > driver is more than enough :) > > > > > really wary of e.g. exposing register configuration flipping to user > > > space even if the driver can do that. > > > > Nor do I intend to make such attempts in the future, neither there is > > anything like this in my driver. > > Ack. > > > >> If the hardware (or it's firmware) supports something natively why > > >> should we go for a less efficient SW emulated replacement? After all, > > >> preview and capture mode seem pretty basic features that applications > > >> will want to use. > > > > > > I think it depends on an application. If your application only knows it > > > wants to do "viewfinder" or "capture" then it might be V4L2 could be a > > > too low level interface for that job. > > > > Sorry, this is all not about the applications capabilities. Only about > > the V4L2 API limitations in using the existing devices. > > > > > I might suggest GSTphotography instead. > > > > GstPhotography is not really impressive in its current state: > > http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad- > > plugins/html/GstPhotography.html > > I'm probably not the best person to comment on this, but do you think > something is e.g. either missing or should be implemented differently? > > > It still belongs to the Bad Plugins group, right ? > > That's right. > > > Although I am not an OpenMAX advocate, it seems top have a better defined > > interface (chapter 8.9.1). > > http://www.khronos.org/registry/omxil/specs/OpenMAX_IL_1_1_2_Specificatio > > n.pdf The GStreamer Bad Plugins are not necessarily of worse quality than the OpenMAX specification ;-) Please also remember that OMX is a userspace API, we need something at the userspace level as well. > > >>> I would rather measure and attempt to optimise the register writes in > > >>> the driver first before adding complexity to user space interface. > > >> > > >> Yeah, I'm not planning to use the presets plainly for different user > > >> configurations, just trying to design the driver so those may be > > >> utilised for the device various operation modes. > > >> > > >>> Or do the presets provide other advantages than just storing > > >>> configurations? > > >> > > >> The H/W requires different register sets for preview and capture. For > > >> instance only in the capture mode the flash control is performed. So > > >> it's important to know whether we start in preview or capture mode, > > >> and these modes have distinct registers for resolution setup, etc. As > > >> a side note, I'm not highly interested in supporting snapshot mode > > >> with S5K6AAFX. The M-5MOLS sensor is a better target for this, for > > >> instance. > > > > > > As far as I understand, the M-5MOLS indeed needs to know it's capturing > > > a still image. Raw non-smart sensors, however, don't even recognise > > > such a concept. > > > > Yes. Although the world is not all made of raw ("non-smart") sensor > > + local SoC ISP configurations. > > I intended to refer to that as an example only. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-10-02 7:20 ` Sakari Ailus 2011-10-03 8:33 ` Laurent Pinchart @ 2011-10-06 20:00 ` Sylwester Nawrocki 2011-10-06 21:36 ` Sakari Ailus 1 sibling, 1 reply; 19+ messages in thread From: Sylwester Nawrocki @ 2011-10-06 20:00 UTC (permalink / raw) To: Sakari Ailus Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim Moikka Sakari, On 10/02/2011 09:20 AM, Sakari Ailus wrote: > On Sat, Oct 01, 2011 at 11:17:27AM +0200, Sylwester Nawrocki wrote: >> Hi Sakari, >> >> I'm sorry, I've been a little bit busy in the week to get back to this. > > Hi Sylwester, > > No worries! > >> On 09/27/2011 10:55 PM, Sakari Ailus wrote: >>> Sylwester Nawrocki wrote: >>>> On 09/25/2011 12:08 PM, Sakari Ailus wrote: >>>>> On Fri, Sep 23, 2011 at 12:12:58PM +0200, Sylwester Nawrocki wrote: >>>>>> On 09/23/2011 12:02 AM, Sakari Ailus wrote: >>>>>>> Hi Sylwester, >>>>>>> >>>>>>> I have a few additional comments below, they don't depend on my earlier >>>>>>> ones. >>>>>> >>>>>> Thanks a lot for your follow up review! >>>>>>> >>>>>>> On Wed, Sep 21, 2011 at 07:45:07PM +0200, Sylwester Nawrocki wrote: >>>>>>>> This driver exposes preview mode operation of the S5K6AAFX sensor with >>>>>>>> embedded SoC ISP. It uses one of the five user predefined configuration >>>>>>>> register sets. There is yet no support for capture (snapshot) operation. >>>>>>>> Following controls are supported: >>>>>>>> manual/auto exposure and gain, power line frequency (anti-flicker), >>>>>>>> saturation, sharpness, brightness, contrast, white balance temperature, >>>>>>>> color effects, horizontal/vertical image flip, frame interval. >>>>>>>> >>>>>>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >>>>>>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >>>>>>>> --- >>>>>> ... >>>>>>>> + >>>>>>>> +struct s5k6aa_pixfmt { >>>>>>>> + enum v4l2_mbus_pixelcode code; >>>>>>>> + u32 colorspace; >>>>>>>> + /* REG_P_FMT(x) register value */ >>>>>>>> + u16 reg_p_fmt; >>>>>>>> +}; >>>>>>>> + >>>>>>>> +struct s5k6aa_preset { >>>>>>>> + struct v4l2_frmsize_discrete out_size; >>>>>>>> + struct v4l2_rect in_win; >>>>>>>> + const struct s5k6aa_pixfmt *pixfmt; >>>>>>>> + unsigned int inv_hflip:1; >>>>>>>> + unsigned int inv_vflip:1; >>>>>>>> + u8 frame_rate_type; >>>>>>>> + u8 index; >>>>>>>> +}; >>>>>>>> + >>>>> >>>>> [clip] >>>>> >>>>>>>> +/* Set initial values for all preview presets */ >>>>>>>> +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, >>>>>>>> + int hflip, int vflip) >>>>>>>> +{ >>>>>>>> + struct s5k6aa_preset *preset =&s5k6aa->presets[0]; >>>>>>>> + int i; >>>>>>>> + >>>>>>>> + for (i = 0; i< S5K6AA_MAX_PRESETS; i++) { >>>>>>>> + preset->pixfmt =&s5k6aa_formats[0]; >>>>>>>> + preset->frame_rate_type = FR_RATE_DYNAMIC; >>>>>>>> + preset->inv_hflip = hflip; >>>>>>>> + preset->inv_vflip = vflip; >>>>>>>> + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; >>>>>>>> + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; >>>>>>>> + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; >>>>>>>> + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; >>>>>>>> + preset->in_win.left = 0; >>>>>>>> + preset->in_win.top = 0; >>>>>>> >>>>>>> Much of this data is static, why is it copied to the presets struct? >>>>>>> >>>>>>> What is the intended purpose of these presets? >>>>>> >>>>>> I agree there is no need to keep inv_hflip/inv_vflip there. It's more a >>>>>> leftover from previous driver version. I'll move it to struct s5k6aa. >>>>>> And I try to keep copy of each platform_data attribute in driver's >>>>>> private struct to make future transition to DT driver probing easier. >>>>>> >>>>>> inv_[hv]flip variables are used to indicate physical layout of the sensor, >>>>>> as it varies across multiple machines. So indeed they're global, not per >>>>>> the configuration set. >>>>>> >>>>>> Preset are there in the s5k6aafx register interface to allow fast transition >>>>>> between, for instance, low resolution preview and high resolution snapshot. >>>>>> I'm planning to use this driver as an experimental rabbit for the future >>>>>> snapshot mode API. >>>>> >>>>> It sounds like that a "snapshot mode" would be an use case that presets >>>>> could support in a way, but what I'd really like to ask is how much >>>>> advantage one can get by using this mode, say, vs. re-programming the same >>>>> settings over the I2C bus? The bus transfers (I assume) roughly 40 kB/s, so >>>>> I imagine a few tens of register writes can be avoided by most, taking >>>>> somewhere in the range of a few milliseconds. >>>> >>>> As far as the timings are concerned, for this particular device, the >>>> advantage is not really meaningful. We are talking about appr. 20 >>>> registers (~50 bytes on I2C bus), which is a ridiculously low number. >>>> However, even if the interface isn't exposed to user space, in the >>>> hardware there exist separate registers for preview and (still) capture >>>> and it makes much sense in the driver to model this, for easier device >>>> control. >>> >>> How do you know when to switch the preset if you don't expose this to the >>> user space? >> >> I don't, the user configuration data structure is there in the driver to more >> precisely reflect the control interface of the device and better understand >> what this driver supports and what it doesn't. Even if I use only one user >> configuration register set _internally_ in the driver, there must be some >> information provided to the device associated with it, like which user config >> set we use, which clocks configuration applies to it, etc. Please don't make >> me converting this driver to a total mess. :) > > :) > > Indeed. After reading the patch 4th time, I realised there's just one preset > supported right now. > > I found a relatively decent datasheet, too. Nice. There is also some more details in the available application note. > >>> I'm not sure if this makes it easier for the user space. The user space must >>> know about such a think and aslo which parameters it applies to. I don't >> >> Yes, I agree on this entirely. >> >>> think this ocnforms to V4L2 either, but I might have misunderstood >>> something. >> >> If there is anything in the code not conforming to V4L2 please indicate it >> clearly. > > Ok, what the driver currently implements, does conform to V4L2. But getting > advantage (which I'd like to argue might be irrelevant) using different > presets would be challenging to implement while obeying the V4L2 spec. > >>>> Anyway, I've taken a closer look at what I need in the single user >>>> configuration set data structure and reworked the driver quite >>>> extensively. Should post that in the coming week, unless some unexpected >>>> disasters occur;) >>>> >>>> Do you see any problem in defining real still capture interface in V4L ? >>>> It's probably just a small set of new controls, new capability, plus >>>> multi-size buffer queue Guennadi has been working on. Some devices will >>>> require explicitly switching between preview and capture mode, and it may >>>> make difference if they are programmed in advance or on demand. >>> >>> I don't think V4L2 should have a still capture interface. Still capture is >>> just one use case as viewfinder and video. V4L2 deals with frames, formats >>> and parameters that are all generic and use case independent. Instead of use >>> cases, we have independent configurable settings and that's the way I think >>> it should stay. >>> >>> If your hardware requires switching mode to "still" before taking a still >>> image, then the driver should expose this functionality as such. I'd be >> >> Yeah, of course this should work. But I don't quite see how would I expose the >> "still"/"normal" switch control with existing API. Aren't you going to blackball >> this as just another 'use case' ? :) > > That's fine because it's implemented by the sensor already. My point is that > we should only show this fact in V4L2 API as little as possible. > > I remember Guennadi had sensors which provide something called "snapshot > mode". A single boolean control to turn this on or off would suffice --- > snapshot mode is something that's going to be discussed in the Multimedia > summit if my memory serves me right. Perhaps, although I don't expect huge outcome from one or two days meeting. Hopefully it gets us closer into the right direction. I'll try to prepare a brief summary of the m-5mols sensor requirements. > > This could be one option for this sensor as well but the implementation > might not be quite optimal since you'd still need to switch the > configuration. I believe the final result would be acceptable as well. However I recall going through a datasheet of a camera device which was capable of generating simultaneously low resolution YUV and a higher resolution capture JPEG data stream. Either on same MIPI-CSI channel or on separate ones. This was to achieve so called "zero shutter lag". For this kind of device you may need two separate resolutions, at least an application and the driver must keep track of them. > >> In fact preview/still mode control seems to be a minimum needed to expose full >> functionality of the S5K6AAFX device in V4L2 API. But I am not really interested >> in "still" capture with this device ATM. The current driver is more than enough :) >> >>> really wary of e.g. exposing register configuration flipping to user space >>> even if the driver can do that. >> >> Nor do I intend to make such attempts in the future, neither there is anything >> like this in my driver. > > Ack. > >>>> If the hardware (or it's firmware) supports something natively why should >>>> we go for a less efficient SW emulated replacement? After all, preview and >>>> capture mode seem pretty basic features that applications will want to >>>> use. >>> >>> I think it depends on an application. If your application only knows it >>> wants to do "viewfinder" or "capture" then it might be V4L2 could be a too >>> low level interface for that job. >> >> Sorry, this is all not about the applications capabilities. Only about the V4L2 API >> limitations in using the existing devices. >> >>> >>> I might suggest GSTphotography instead. >> >> GstPhotography is not really impressive in its current state: >> http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-plugins/html/GstPhotography.html > > I'm probably not the best person to comment on this, but do you think > something is e.g. either missing or should be implemented differently? I'm not a big expert either. The GstPhotography interface seems not well documented, I just tried to imagine how it could be used with above mentioned camera chip supporting interlaced viewfinder/capture data stream. > >> It still belongs to the Bad Plugins group, right ? > > That's right. > >> Although I am not an OpenMAX advocate, it seems top have a better defined interface >> (chapter 8.9.1). >> http://www.khronos.org/registry/omxil/specs/OpenMAX_IL_1_1_2_Specification.pdf >> >>> >>>>> I would rather measure and attempt to optimise the register writes in the >>>>> driver first before adding complexity to user space interface. >>>> >>>> Yeah, I'm not planning to use the presets plainly for different user >>>> configurations, just trying to design the driver so those may be utilised >>>> for the device various operation modes. >>>> >>>>> >>>>> Or do the presets provide other advantages than just storing configurations? >>>> >>>> The H/W requires different register sets for preview and capture. For >>>> instance only in the capture mode the flash control is performed. So it's >>>> important to know whether we start in preview or capture mode, and these >>>> modes have distinct registers for resolution setup, etc. As a side note, >>>> I'm not highly interested in supporting snapshot mode with S5K6AAFX. The >>>> M-5MOLS sensor is a better target for this, for instance. >>> >>> As far as I understand, the M-5MOLS indeed needs to know it's capturing a >>> still image. Raw non-smart sensors, however, don't even recognise such a >>> concept. >> >> Yes. Although the world is not all made of raw ("non-smart") sensorer >> + local SoC ISP configurations. > > I intended to refer to that as an example only. Sorry, I must just have overreacted here. -- Regards, Sylwester ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-10-06 20:00 ` Sylwester Nawrocki @ 2011-10-06 21:36 ` Sakari Ailus 0 siblings, 0 replies; 19+ messages in thread From: Sakari Ailus @ 2011-10-06 21:36 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sw0312.kim, riverful.kim On Thu, Oct 06, 2011 at 10:00:50PM +0200, Sylwester Nawrocki wrote: > Moikka Sakari, Hi, Sylwester! > On 10/02/2011 09:20 AM, Sakari Ailus wrote: > > On Sat, Oct 01, 2011 at 11:17:27AM +0200, Sylwester Nawrocki wrote: [clip] > > That's fine because it's implemented by the sensor already. My point is that > > we should only show this fact in V4L2 API as little as possible. > > > > I remember Guennadi had sensors which provide something called "snapshot > > mode". A single boolean control to turn this on or off would suffice --- > > snapshot mode is something that's going to be discussed in the Multimedia > > summit if my memory serves me right. > > Perhaps, although I don't expect huge outcome from one or two days meeting. > Hopefully it gets us closer into the right direction. > I'll try to prepare a brief summary of the m-5mols sensor requirements. > > > > > This could be one option for this sensor as well but the implementation > > might not be quite optimal since you'd still need to switch the > > configuration. > > I believe the final result would be acceptable as well. > > However I recall going through a datasheet of a camera device which was capable > of generating simultaneously low resolution YUV and a higher resolution capture > JPEG data stream. Either on same MIPI-CSI channel or on separate ones. This was > to achieve so called "zero shutter lag". > For this kind of device you may need two separate resolutions, at least > an application and the driver must keep track of them. This kind of device requires two source pads. The same goes for the CSI-2 reciever: the CSI-2 channels are freely configurable even if the current drivers typically only use one. Two video nodes are required, too, since the images are independent of each other. In other words, this is already supported by the V4L2 interface. :-) [clip] > >>>> If the hardware (or it's firmware) supports something natively why should > >>>> we go for a less efficient SW emulated replacement? After all, preview and > >>>> capture mode seem pretty basic features that applications will want to > >>>> use. > >>> > >>> I think it depends on an application. If your application only knows it > >>> wants to do "viewfinder" or "capture" then it might be V4L2 could be a too > >>> low level interface for that job. > >> > >> Sorry, this is all not about the applications capabilities. Only about the V4L2 API > >> limitations in using the existing devices. > >> > >>> > >>> I might suggest GSTphotography instead. > >> > >> GstPhotography is not really impressive in its current state: > >> http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-plugins/html/GstPhotography.html > > > > I'm probably not the best person to comment on this, but do you think > > something is e.g. either missing or should be implemented differently? > > I'm not a big expert either. The GstPhotography interface seems not well documented, > I just tried to imagine how it could be used with above mentioned camera chip > supporting interlaced viewfinder/capture data stream. The lack of documentation aspect might be a valid complaint. :) I'm not a Gstreamer expert so take this with a grain of salt: This interface is used to control the capture process, and setting the resolutions is not part of that interface. The GSTphotography interface is provided by the camera source. A source used with Camerabin2 has three output pads: one of the pads provides viewfinder stream while another one provides captured images. The third putput pad is for video. <URL:http://gstreamer.freedesktop.org/wiki/CameraBin> I your case the source provides the viewfinder and captures images through the two pads. Kind regards, -- Sakari Ailus e-mail: sakari.ailus@iki.fi jabber/XMPP/Gmail: sailus@retiisi.org.uk ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-21 17:45 ` [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 2011-09-22 22:02 ` Sakari Ailus @ 2011-09-26 13:21 ` Hans Verkuil 2011-09-26 21:49 ` Sylwester Nawrocki 1 sibling, 1 reply; 19+ messages in thread From: Hans Verkuil @ 2011-09-26 13:21 UTC (permalink / raw) To: Sylwester Nawrocki Cc: linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim On Wednesday, September 21, 2011 19:45:07 Sylwester Nawrocki wrote: > This driver exposes preview mode operation of the S5K6AAFX sensor with > embedded SoC ISP. It uses one of the five user predefined configuration > register sets. There is yet no support for capture (snapshot) operation. > Following controls are supported: > manual/auto exposure and gain, power line frequency (anti-flicker), > saturation, sharpness, brightness, contrast, white balance temperature, > color effects, horizontal/vertical image flip, frame interval. > > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/media/video/Kconfig | 7 + > drivers/media/video/Makefile | 1 + > drivers/media/video/s5k6aa.c | 1482 ++++++++++++++++++++++++++++++++++++++++++ > include/media/s5k6aa.h | 51 ++ > 4 files changed, 1541 insertions(+), 0 deletions(-) > create mode 100644 drivers/media/video/s5k6aa.c > create mode 100644 include/media/s5k6aa.h > > diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig > index 9da6044..ccc8172 100644 > --- a/drivers/media/video/Kconfig > +++ b/drivers/media/video/Kconfig > @@ -496,6 +496,13 @@ config VIDEO_TCM825X > This is a driver for the Toshiba TCM825x VGA camera sensor. > It is used for example in Nokia N800. > > +config VIDEO_S5K6AA > + tristate "Samsung S5K6AAFX sensor support" > + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > + ---help--- > + This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M > + camera sensor with an embedded SoC image signal processor. > + > comment "Flash devices" > > config VIDEO_ADP1653 > diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile > index f52a771..526cb32 100644 > --- a/drivers/media/video/Makefile > +++ b/drivers/media/video/Makefile > @@ -71,6 +71,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o > obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o > obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o > obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ > +obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o > obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o > > obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o > diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c > new file mode 100644 > index 0000000..43b7dac > --- /dev/null > +++ b/drivers/media/video/s5k6aa.c > @@ -0,0 +1,1482 @@ > +/* > + * Driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor > + * with embedded SoC ISP. > + * > + * Copyright (C) 2011, Samsung Electronics Co., Ltd. > + * Author: Sylwester Nawrocki <s.nawrocki@samsung.com> > + * > + * Based on a driver authored by Dongsoo Nathaniel Kim. > + * Copyright (C) 2009, Dongsoo Nathaniel Kim <dongsoo45.kim@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * TODO: > + * - add set/get_crop operations > + * - add capture (snapshot) mode support > + */ > + > +#include <linux/clk.h> > +#include <linux/delay.h> > +#include <linux/gpio.h> > +#include <linux/i2c.h> > +#include <linux/media.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > + > +#include <media/media-entity.h> > +#include <media/v4l2-ctrls.h> > +#include <media/v4l2-device.h> > +#include <media/v4l2-subdev.h> > +#include <media/v4l2-mediabus.h> > +#include <media/s5k6aa.h> > + > +static int debug; > +module_param(debug, int, 0644); > + > +#define DRIVER_NAME "S5K6AA" > + > +/* The token to indicate array termination */ > +#define S5K6AA_TERM 0xffff > +#define S5K6AA_OUT_WIDTH_DEF 640 > +#define S5K6AA_OUT_HEIGHT_DEF 480 > +#define S5K6AA_WIN_WIDTH_MAX 1280 > +#define S5K6AA_WIN_HEIGHT_MAX 1024 > +#define S5K6AA_WIN_WIDTH_MIN 8 > +#define S5K6AA_WIN_HEIGHT_MIN 8 > + > +/* > + * H/W register Interface (0xD0000000 - 0xD0000FFF) > + */ > +#define AHB_MSB_ADDR_PTR 0xfcfc > +#define GEN_REG_OFFSH 0xd000 > +#define REG_SW_RESET 0x0010 > +#define REG_SW_LOAD_COMPLETE 0x0014 > +#define REG_CMDWR_ADDRH 0x0028 > +#define REG_CMDWR_ADDRL 0x002a > +#define REG_CMDRD_ADDRH 0x002c > +#define REG_CMDRD_ADDRL 0x002e > + > +#define REG_CMDBUF0_ADDR 0x0f12 > +#define REG_CMDBUF1_ADDR 0x0f10 > + > +/* > + * Host S/W Register interface (0x70000000 - 0x70002000) > + * The value of the two most significant address bytes is 0x7000, > + * (HOST_SWIF_OFFS_H). The register addresses below specify 2 LSBs. > + */ > +#define HOST_SWIF_OFFSH 0x7000 > + > +/* Initialization parameters */ > +/* Master clock frequency in KHz */ > +#define REG_I_INCLK_FREQ_L 0x01b8 > +#define REG_I_INCLK_FREQ_H 0x01ba > +#define REG_I_USE_NPVI_CLOCKS 0x01c6 > +#define REG_I_USE_NMIPI_CLOCKS 0x01c8 > + > +/* Clock configurations, n = 0..3. REG_I_* frequency unit is 4 kHz. */ > +#define REG_I_OPCLK_4KHZ(n) ((n) * 6 + 0x01cc) > +#define REG_I_MIN_OUTRATE_4KHZ(n) ((n) * 6 + 0x01ce) > +#define REG_I_MAX_OUTRATE_4KHZ(n) ((n) * 6 + 0x01d0) > +#define REG_I_INIT_PARAMS_UPDATED 0x01e0 > +#define MIN_MCLK_FREQ_KHZ 6000U > +#define MAX_MCLK_FREQ_KHZ 27000U > +#define S5K6AA_MIN_PCLK_FREQ 12000U > +#define S5K6AA_MAX_PCLK_FREQ 24000U > + > +/* General purpose parameters */ > +#define REG_USER_BRIGHTNESS 0x01e4 > +#define REG_USER_CONTRAST 0x01e6 > +#define REG_USER_SATURATION 0x01e8 > +#define REG_USER_SHARPBLUR 0x01ea > +#define REG_G_SPEC_EFFECTS 0x01ee > +#define REG_G_ENABLE_PREV 0x01f0 > +#define REG_G_ENABLE_PREV_CHG 0x01f2 > +#define REG_G_NEW_CFG_SYNC 0x01f8 > + > +#define REG_G_PREVZOOM_IN_WIDTH 0x020a > +#define REG_G_PREVZOOM_IN_HEIGHT 0x020c > +#define REG_G_PREVZOOM_IN_XOFFS 0x020e > +#define REG_G_PREVZOOM_IN_YOFFS 0x0210 > +#define REG_G_INPUTS_CHANGE_REQ 0x021a > + > +#define REG_G_ACTIVE_PREV_CFG 0x021c > +#define REG_G_PREV_CFG_CHG 0x021e > +#define REG_G_PREV_OPEN_AFTER_CH 0x0220 > +#define REG_G_PREV_CFG_ERROR 0x0222 > + > +/* Preview control section. n = 0...4. */ > +#define PREG(n, x) ((n) * 0x26 + x) > +#define REG_P_OUT_WIDTH(n) PREG(n, 0x0242) > +#define REG_P_OUT_HEIGHT(n) PREG(n, 0x0244) > +#define REG_P_FMT(n) PREG(n, 0x0246) > +#define REG_P_MAX_OUT_RATE(n) PREG(n, 0x0248) > +#define REG_P_MIN_OUT_RATE(n) PREG(n, 0x024a) > +#define REG_P_PVI_MASK(n) PREG(n, 0x024c) > +#define REG_P_CLK_INDEX(n) PREG(n, 0x024e) > +#define REG_P_FR_RATE_TYPE(n) PREG(n, 0x0250) > +#define FR_RATE_DYNAMIC 0 > +#define FR_RATE_FIXED 1 > +#define FR_RATE_FIXED_ACCURATE 2 > +#define REG_P_FR_RATE_Q_TYPE(n) PREG(n, 0x0252) > +#define FR_RATE_Q_BEST_FRRATE 1 /* Binning enabled */ > +#define FR_RATE_Q_BEST_QUALITY 2 /* Binning disabled */ > +/* Frame period in 0.1 ms units */ > +#define REG_P_MAX_FR_TIME(n) PREG(n, 0x0254) > +#define REG_P_MIN_FR_TIME(n) PREG(n, 0x0256) > +/* Conversion to REG_P_[MAX/MIN]_FR_TIME value; __t: time in us */ > +#define US_TO_FR_TIME(__t) ((__t) / 100) > +#define S5K6AA_MIN_FR_TIME 33300 /* us */ > +#define S5K6AA_MAX_FR_TIME 650000 /* us */ > +#define S5K6AA_MAX_HIGH_RES_FR_TIME 666 /* x100 us */ > +/* The below 5 registers are for "device correction" values */ > +#define REG_P_COLORTEMP(n) PREG(n, 0x025e) > +#define REG_P_PREV_MIRROR(n) PREG(n, 0x0262) > + > +/* Extended image property controls */ > +/* Exposure time in 10 us units */ > +#define REG_SF_USR_EXPOSURE_L 0x03c6 > +#define REG_SF_USR_EXPOSURE_H 0x03c8 > +#define REG_SF_USR_EXPOSURE_CHG 0x03ca > +#define REG_SF_USR_TOT_GAIN 0x03cc > +#define REG_SF_USR_TOT_GAIN_CHG 0x03ce > +#define REG_SF_FLICKER_QUANT 0x03dc > +#define REG_SF_FLICKER_QUANT_CHG 0x03de > + > +/* Output interface (parallel/MIPI) setup */ > +#define REG_OIF_EN_MIPI_LANES 0x03fa > +#define REG_OIF_EN_PACKETS 0x03fc > +#define REG_OIF_CFG_CHG 0x03fe > + > +/* Auto-algorithms enable mask */ > +#define REG_DBG_AUTOALG_EN 0x0400 > +#define AALG_ALL_EN_MASK (1 << 0) > +#define AALG_AE_EN_MASK (1 << 1) > +#define AALG_DIVLEI_EN_MASK (1 << 2) > +#define AALG_WB_EN_MASK (1 << 3) > +#define AALG_FLICKER_EN_MASK (1 << 5) > +#define AALG_FIT_EN_MASK (1 << 6) > +#define AALG_WRHW_EN_MASK (1 << 7) > + > +/* Firmware revision information */ > +#define REG_FW_APIVER 0x012e > +#define S5K6AAFX_FW_APIVER 0x0001 > +#define REG_FW_REVISION 0x0130 > + > +/* For now we use only one user configuration register set */ > +#define S5K6AA_MAX_PRESETS 1 > + > +static const char * const s5k6aa_supply_names[] = { > + "vdd_core", /* Digital core supply 1.5V (1.4V to 1.6V) */ > + "vdda", /* Analog power supply 2.8V (2.6V to 3.0V) */ > + "vdd_reg", /* Regulator input power 1.8V (1.7V to 1.9V) > + or 2.8V (2.6V to 3.0) */ > + "vddio", /* I/O supply 1.8V (1.65V to 1.95V) > + or 2.8V (2.5V to 3.1V) */ > +}; > +#define S5K6AA_NUM_SUPPLIES ARRAY_SIZE(s5k6aa_supply_names) > + > +enum s5k6aa_gpio_id { > + STBY, > + RST, > + GPIO_NUM, > +}; > + > +struct s5k6aa_regval { > + u16 addr; > + u16 val; > +}; > + > +struct s5k6aa_pixfmt { > + enum v4l2_mbus_pixelcode code; > + u32 colorspace; > + /* REG_P_FMT(x) register value */ > + u16 reg_p_fmt; > +}; > + > +struct s5k6aa_preset { > + struct v4l2_frmsize_discrete out_size; > + struct v4l2_rect in_win; > + const struct s5k6aa_pixfmt *pixfmt; > + unsigned int inv_hflip:1; > + unsigned int inv_vflip:1; > + u8 frame_rate_type; > + u8 index; > +}; > + > +/* Not all controls supported by the driver are in this struct. */ > +struct s5k6aa_ctrls { > + struct v4l2_ctrl_handler handler; > + /* Mirror cluster */ > + struct v4l2_ctrl *hflip; > + struct v4l2_ctrl *vflip; > + /* Auto exposure / manual exposure and gain cluster */ > + struct v4l2_ctrl *auto_exp; > + struct v4l2_ctrl *exposure; > + struct v4l2_ctrl *gain; > +}; > + > +struct s5k6aa_interval { > + u16 reg_fr_time; > + struct v4l2_fract interval; > + /* Maximum rectangle for the interval */ > + struct v4l2_frmsize_discrete size; > +}; > + > +struct s5k6aa { > + struct v4l2_subdev sd; > + struct media_pad pad; > + > + enum v4l2_mbus_type bus_type; > + u8 mipi_lanes; > + > + int (*s_power)(int enable); > + struct regulator_bulk_data supplies[S5K6AA_NUM_SUPPLIES]; > + struct s5k6aa_gpio gpio[GPIO_NUM]; > + > + /* master clock frequency */ > + unsigned long mclk_frequency; > + u16 clk_fop; > + u16 clk_fmin; > + u16 clk_fmax; > + > + /* protects the struct members below */ > + struct mutex lock; > + > + struct s5k6aa_ctrls ctrls; > + struct s5k6aa_preset presets[S5K6AA_MAX_PRESETS]; > + struct s5k6aa_preset *preset; > + const struct s5k6aa_interval *fiv; > + > + unsigned int streaming:1; > + unsigned int apply_new_cfg:1; > + unsigned int power; > +}; > + > +static struct s5k6aa_regval s5k6aa_analog_config[] = { > + /* Analog settings */ > + { 0x112A, 0x0000 }, { 0x1132, 0x0000 }, > + { 0x113E, 0x0000 }, { 0x115C, 0x0000 }, > + { 0x1164, 0x0000 }, { 0x1174, 0x0000 }, > + { 0x1178, 0x0000 }, { 0x077A, 0x0000 }, > + { 0x077C, 0x0000 }, { 0x077E, 0x0000 }, > + { 0x0780, 0x0000 }, { 0x0782, 0x0000 }, > + { 0x0784, 0x0000 }, { 0x0786, 0x0000 }, > + { 0x0788, 0x0000 }, { 0x07A2, 0x0000 }, > + { 0x07A4, 0x0000 }, { 0x07A6, 0x0000 }, > + { 0x07A8, 0x0000 }, { 0x07B6, 0x0000 }, > + { 0x07B8, 0x0002 }, { 0x07BA, 0x0004 }, > + { 0x07BC, 0x0004 }, { 0x07BE, 0x0005 }, > + { 0x07C0, 0x0005 }, { S5K6AA_TERM, 0 }, > +}; > + > +/* TODO: Add RGB888 and Bayer format */ > +static const struct s5k6aa_pixfmt s5k6aa_formats[] = { > + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 }, > + /* range 16-240 */ > + { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_REC709, 6 }, > + { V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_JPEG, 0 }, > +}; > + > +static const struct s5k6aa_interval s5k6aa_intervals[] = { > + { 1000, {10000, 1000000}, {1280, 1024} }, /* 10 fps */ > + { 666, {15000, 1000000}, {1280, 1024} }, /* 15 fps */ > + { 500, {20000, 1000000}, {1280, 720} }, /* 20 fps */ > + { 400, {25000, 1000000}, {640, 480} }, /* 25 fps */ > + { 333, {33300, 1000000}, {640, 480} }, /* 30 fps */ > +}; > + > +#define S5K6AA_INTERVAL_DEF_INDEX 1 /* 15 fps */ > + > +static struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl) > +{ > + return &container_of(ctrl->handler, struct s5k6aa, ctrls.handler)->sd; > +} > + > +static struct s5k6aa *to_s5k6aa(struct v4l2_subdev *sd) > +{ > + return container_of(sd, struct s5k6aa, sd); > +} > + > +/* Set initial values for all preview presets */ > +static void s5k6aa_presets_data_init(struct s5k6aa *s5k6aa, > + int hflip, int vflip) > +{ > + struct s5k6aa_preset *preset = &s5k6aa->presets[0]; > + int i; > + > + for (i = 0; i < S5K6AA_MAX_PRESETS; i++) { > + preset->pixfmt = &s5k6aa_formats[0]; > + preset->frame_rate_type = FR_RATE_DYNAMIC; > + preset->inv_hflip = hflip; > + preset->inv_vflip = vflip; > + preset->out_size.width = S5K6AA_OUT_WIDTH_DEF; > + preset->out_size.height = S5K6AA_OUT_HEIGHT_DEF; > + preset->in_win.width = S5K6AA_WIN_WIDTH_MAX; > + preset->in_win.height = S5K6AA_WIN_HEIGHT_MAX; > + preset->in_win.left = 0; > + preset->in_win.top = 0; > + preset->index = i; > + preset++; > + } > + > + s5k6aa->fiv = &s5k6aa_intervals[S5K6AA_INTERVAL_DEF_INDEX]; > + s5k6aa->preset = &s5k6aa->presets[0]; > +} > + > +static int s5k6aa_i2c_read(struct i2c_client *client, u16 addr, u16 *val) > +{ > + u8 wbuf[2] = {addr >> 8, addr & 0xFF}; > + struct i2c_msg msg[2]; > + u8 rbuf[2]; > + int ret; > + > + msg[0].addr = client->addr; > + msg[0].flags = 0; > + msg[0].len = 2; > + msg[0].buf = wbuf; > + > + msg[1].addr = client->addr; > + msg[1].flags = I2C_M_RD; > + msg[1].len = 2; > + msg[1].buf = rbuf; > + > + ret = i2c_transfer(client->adapter, msg, 2); > + *val = be16_to_cpu(*((u16 *)rbuf)); > + > + v4l2_dbg(3, debug, client, "i2c_read: 0x%04X : 0x%04x\n", addr, *val); > + > + return ret == 2 ? 0 : ret; > +} > + > +static int s5k6aa_i2c_write(struct i2c_client *client, u16 addr, u16 val) > +{ > + u8 buf[4] = {addr >> 8, addr & 0xFF, val >> 8, val & 0xFF}; > + > + int ret = i2c_master_send(client, buf, 4); > + v4l2_dbg(3, debug, client, "i2c_write: 0x%04X : 0x%04x\n", addr, val); > + > + return ret == 4 ? 0 : ret; > +} > + > +/* The command register write, assumes Command_Wr_addH = 0x7000. */ > +static int s5k6aa_write(struct i2c_client *c, u16 addr, u16 val) > +{ > + int ret = s5k6aa_i2c_write(c, REG_CMDWR_ADDRL, addr); > + if (ret) > + return ret; > + return s5k6aa_i2c_write(c, REG_CMDBUF0_ADDR, val); > +} > + > +/* The command register read, assumes Command_Rd_addH = 0x7000. */ > +static int s5k6aa_read(struct i2c_client *client, u16 addr, u16 *val) > +{ > + int ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRL, addr); > + if (ret) > + return ret; > + return s5k6aa_i2c_read(client, REG_CMDBUF0_ADDR, val); > +} > + > +static int s5k6aa_write_array(struct v4l2_subdev *sd, > + const struct s5k6aa_regval *msg) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(sd); > + u16 addr_incr = 0; > + int ret = 0; > + > + while (msg->addr != S5K6AA_TERM) { > + if (addr_incr != 2) > + ret = s5k6aa_i2c_write(client, REG_CMDWR_ADDRL, > + msg->addr); > + if (ret) > + break; > + ret = s5k6aa_i2c_write(client, REG_CMDBUF0_ADDR, msg->val); > + if (ret) > + break; > + /* Assume that msg->addr is always less than 0xfffc */ > + addr_incr = (msg + 1)->addr - msg->addr; > + msg++; > + } > + > + return ret; > +} > + > +/* Configure the AHB high address bytes for GTG registers access */ > +static int s5k6aa_set_ahb_address(struct i2c_client *client) > +{ > + int ret = s5k6aa_i2c_write(client, AHB_MSB_ADDR_PTR, GEN_REG_OFFSH); > + if (ret) > + return ret; > + ret = s5k6aa_i2c_write(client, REG_CMDRD_ADDRH, HOST_SWIF_OFFSH); > + if (ret) > + return ret; > + return s5k6aa_i2c_write(client, REG_CMDWR_ADDRH, HOST_SWIF_OFFSH); > +} > + > +/** > + * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration > + * > + * Configure the internal ISP PLL for 24 MHz output frequency. > + * Locking: called with s5k6aa->lock mutex held. > + */ > +static int s5k6aa_configure_pixel_clock(struct s5k6aa *s5k6aa) > +{ > + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); > + unsigned long fmclk = s5k6aa->mclk_frequency / 1000; > + int ret; > + > + if (WARN(fmclk < MIN_MCLK_FREQ_KHZ || fmclk > MAX_MCLK_FREQ_KHZ, > + "Invalid clock frequency: %ld\n", fmclk)) > + return -EINVAL; > + > + s5k6aa->clk_fop = 24000000U / 4000U; > + s5k6aa->clk_fmin = 48000000U / 4000U; > + s5k6aa->clk_fmax = 56000000U / 4000U; > + > + /* External input clock frequency in kHz */ > + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_H, fmclk >> 16); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_INCLK_FREQ_L, fmclk & 0xFFFF); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_USE_NPVI_CLOCKS, 1); > + /* Internal PLL frequency */ > + if (!ret) > + ret = s5k6aa_write(c, REG_I_OPCLK_4KHZ(0), s5k6aa->clk_fop); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_MIN_OUTRATE_4KHZ(0), > + s5k6aa->clk_fmin); > + if (!ret) > + ret = s5k6aa_write(c, REG_I_MAX_OUTRATE_4KHZ(0), > + s5k6aa->clk_fmax); > + return ret ? ret : s5k6aa_write(c, REG_I_INIT_PARAMS_UPDATED, 1); > +} > + > +/* Set horizontal and vertical image flipping */ > +static int s5k6aa_set_mirror(struct s5k6aa *s5k6aa, int horiz_flip) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + struct s5k6aa_preset *preset = s5k6aa->preset; > + > + unsigned int vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip; > + unsigned int hflip = horiz_flip ^ preset->inv_hflip; > + > + return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index), > + hflip | (vflip << 1)); > +} > + > +/* Program FW with exposure time, 'exposure' in us units */ > +static int s5k6aa_set_user_exposure(struct i2c_client *client, int exposure) > +{ > + unsigned int time = exposure / 10; > + > + int ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_L, time & 0xffff); > + if (!ret) > + ret = s5k6aa_write(client, REG_SF_USR_EXPOSURE_H, time >> 16); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_SF_USR_EXPOSURE_CHG, 1); > +} > + > +static int s5k6aa_set_user_gain(struct i2c_client *client, int gain) > +{ > + int ret = s5k6aa_write(client, REG_SF_USR_TOT_GAIN, gain); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_SF_USR_TOT_GAIN_CHG, 1); > +} > + > +/* Set auto/manual exposure and total gain */ > +static int s5k6aa_set_auto_exposure(struct s5k6aa *s5k6aa, int value) > +{ > + struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd); > + unsigned int exp_time = s5k6aa->ctrls.exposure->val; > + u16 auto_alg; > + > + int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &auto_alg); > + if (ret) > + return ret; > + > + v4l2_dbg(1, debug, c, "man_exp: %d, auto_exp: %d, a_alg: 0x%x\n", > + exp_time, value, auto_alg); > + > + if (value == V4L2_EXPOSURE_AUTO) { > + auto_alg |= AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK; > + } else { > + ret = s5k6aa_set_user_exposure(c, exp_time); > + if (ret) > + return ret; > + ret = s5k6aa_set_user_gain(c, s5k6aa->ctrls.gain->val); > + if (ret) > + return ret; > + auto_alg &= ~(AALG_AE_EN_MASK | AALG_DIVLEI_EN_MASK); > + } > + > + return s5k6aa_write(c, REG_DBG_AUTOALG_EN, auto_alg); > +} > + > +static int s5k6aa_set_anti_flicker(struct s5k6aa *s5k6aa, int value) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 auto_alg; > + int ret; > + > + ret = s5k6aa_read(client, REG_DBG_AUTOALG_EN, &auto_alg); > + if (ret) > + return ret; > + > + if (value == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) { > + auto_alg |= AALG_FLICKER_EN_MASK; > + } else { > + auto_alg &= ~AALG_FLICKER_EN_MASK; > + /* The V4L2_CID_LINE_FREQUENCY control values are > + * suitable for writing directly to this register */ > + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT, value); > + if (ret) > + return ret; > + ret = s5k6aa_write(client, REG_SF_FLICKER_QUANT_CHG, 1); > + if (ret) > + return ret; > + } > + > + return s5k6aa_write(client, REG_DBG_AUTOALG_EN, auto_alg); > +} > + > +static int s5k6aa_set_colorfx(struct s5k6aa *s5k6aa, int val) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + static const struct v4l2_control colorfx[] = { > + { V4L2_COLORFX_NONE, 0 }, > + { V4L2_COLORFX_BW, 1 }, > + { V4L2_COLORFX_NEGATIVE, 2 }, > + { V4L2_COLORFX_SEPIA, 3 }, > + { V4L2_COLORFX_SKY_BLUE, 4 }, > + { V4L2_COLORFX_SKETCH, 5 }, > + }; > + int i; > + > + for (i = 0; i < ARRAY_SIZE(colorfx); i++) { > + if (colorfx[i].id == val) > + return s5k6aa_write(client, REG_G_SPEC_EFFECTS, > + colorfx[i].value); > + } > + return -EINVAL; > +} > + > +static int s5k6aa_get_preview_cfg_status(struct i2c_client *client) > +{ > + u16 error = 0; > + int ret = s5k6aa_read(client, REG_G_PREV_CFG_ERROR, &error); > + > + v4l2_dbg(1, debug, client, "error: 0x%x (%d)\n", error, ret); > + return ret ? ret : (error == 0 ? 0 : -EINVAL); > +} > + > +static int s5k6aa_set_output_framefmt(struct s5k6aa *s5k6aa, > + struct s5k6aa_preset *preset, bool apply) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int ret; > + > + if (WARN_ON(preset->pixfmt == NULL)) > + return -EINVAL; > + > + ret = s5k6aa_write(client, REG_P_OUT_WIDTH(preset->index), > + preset->out_size.width); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_OUT_HEIGHT(preset->index), > + preset->out_size.height); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FMT(preset->index), > + preset->pixfmt->reg_p_fmt); > + if (!ret && apply) { > + ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); > + if (!ret) > + ret = s5k6aa_get_preview_cfg_status(client); > + } > + > + return ret; > +} > + > +/** > + * s5k6aa_configure_video_bus - configure the video output interface > + * @bus_type: video bus type: parallel or MIPI-CSI > + * @nlanes: number of MIPI lanes to be used (MIPI-CSI only) > + * > + * Note: Only parallel bus operation has been tested. > + */ > +static int s5k6aa_configure_video_bus(struct s5k6aa *s5k6aa, > + enum v4l2_mbus_type bus_type, int nlanes) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 cfg = 0; > + int ret; > + > + /* > + * TODO: The sensor is supposed to support BT.601 and BT.656 > + * but there is nothing indicating how to switch between both > + * in the datasheet. For now default BT.601 interface is assumed. > + */ > + if (bus_type == V4L2_MBUS_CSI2) > + cfg = nlanes; > + else if (bus_type != V4L2_MBUS_PARALLEL) > + return -EINVAL; > + > + ret = s5k6aa_write(client, REG_OIF_EN_MIPI_LANES, cfg); > + if (ret) > + return ret; > + return s5k6aa_write(client, REG_OIF_CFG_CHG, 1); > +} > + > +static int s5k6aa_sync_preview_preset(struct i2c_client *client, int timeout) > +{ > + unsigned long end = jiffies + msecs_to_jiffies(timeout); > + u16 reg = 1; > + > + int ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); > + if (timeout == 0) > + return ret; > + > + while (ret >= 0 && time_is_after_jiffies(end)) { > + ret = s5k6aa_read(client, REG_G_NEW_CFG_SYNC, ®); > + if (!reg) > + return 0; > + usleep_range(1000, 5000); > + } > + return ret ? ret : -ETIMEDOUT; > +} > + > +/** > + * s5k6aa_set_preview_preset - write user preview register set > + * > + * Configure pixel clock frequency range, device frame rate type > + * and frame period range. > + */ > +static int s5k6aa_set_preview_preset(struct s5k6aa *s5k6aa, > + struct s5k6aa_preset *preset) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int idx = preset->index; > + u16 frame_rate_q; > + int ret; > + > + if (s5k6aa->fiv->reg_fr_time >= S5K6AA_MAX_HIGH_RES_FR_TIME) > + frame_rate_q = FR_RATE_Q_BEST_FRRATE; > + else > + frame_rate_q = FR_RATE_Q_BEST_QUALITY; > + > + ret = s5k6aa_set_output_framefmt(s5k6aa, preset, true); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MAX_OUT_RATE(idx), > + S5K6AA_MAX_PCLK_FREQ); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MIN_OUT_RATE(idx), > + S5K6AA_MIN_PCLK_FREQ); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FR_RATE_TYPE(idx), > + preset->frame_rate_type); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_FR_RATE_Q_TYPE(idx), > + frame_rate_q); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MAX_FR_TIME(idx), > + s5k6aa->fiv->reg_fr_time + 15); > + if (!ret) > + ret = s5k6aa_write(client, REG_P_MIN_FR_TIME(idx), > + s5k6aa->fiv->reg_fr_time - 15); > + if (!ret) > + ret = s5k6aa_sync_preview_preset(client, 0); > + > + if (!ret) { > + ret = s5k6aa_get_preview_cfg_status(client); > + s5k6aa->apply_new_cfg = 0; > + } > + > + v4l2_dbg(1, debug, client, "frame interval: %d +/- 1.5ms. (%d)\n", > + s5k6aa->fiv->reg_fr_time, ret); > + return ret; > +} > + > +/** > + * s5k6aa_initialize_isp - basic ISP MCU initialization > + * > + * Configure AHB addresses for registers read/write; configure PLLs for > + * required output pixel clock. The ISP power supply needs to be already > + * enabled, with an optional H/W reset. > + * Locking: called with s5k6aa.lock mutex held. > + */ > +static int s5k6aa_initialize_isp(struct v4l2_subdev *sd) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(sd); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + s5k6aa->apply_new_cfg = 1; > + > + ret = s5k6aa_set_ahb_address(client); > + if (ret) > + return ret; > + ret = s5k6aa_configure_video_bus(s5k6aa, s5k6aa->bus_type, > + s5k6aa->mipi_lanes); > + if (ret) > + return ret; > + ret = s5k6aa_write_array(sd, s5k6aa_analog_config); > + if (ret) > + return ret; > + msleep(100); > + > + return s5k6aa_configure_pixel_clock(s5k6aa); > +} > + > +static int s5k6aa_gpio_set_value(struct s5k6aa *priv, int id, u32 val) > +{ > + if (!gpio_is_valid(priv->gpio[id].gpio)) > + return 0; > + gpio_set_value(priv->gpio[id].gpio, !!val); > + return 1; > +} > + > +static int s5k6aa_gpio_assert(struct s5k6aa *priv, int id) > +{ > + return s5k6aa_gpio_set_value(priv, id, priv->gpio[id].level); > +} > + > +static int s5k6aa_gpio_deassert(struct s5k6aa *priv, int id) > +{ > + return s5k6aa_gpio_set_value(priv, id, !priv->gpio[id].level); > +} > + > +static int __s5k6aa_power_enable(struct s5k6aa *s5k6aa) > +{ > + int ret; > + > + ret = regulator_bulk_enable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > + if (ret) > + return ret; > + if (s5k6aa_gpio_deassert(s5k6aa, STBY)) > + udelay(200); > + > + if (s5k6aa->s_power) > + ret = s5k6aa->s_power(1); > + usleep_range(4000, 4000); > + > + if (s5k6aa_gpio_deassert(s5k6aa, RST)) > + msleep(20); > + > + return ret; > +} > + > +static int __s5k6aa_power_disable(struct s5k6aa *s5k6aa) > +{ > + int ret; > + > + if (s5k6aa_gpio_assert(s5k6aa, RST)) > + udelay(100); > + > + if (s5k6aa->s_power) { > + ret = s5k6aa->s_power(0); > + if (ret) > + return ret; > + } > + if (s5k6aa_gpio_assert(s5k6aa, STBY)) > + udelay(50); > + > + return regulator_bulk_disable(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > +} > + > +/* > + * V4L2 subdev core and video operations > + */ > +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret = 0; > + > + mutex_lock(&s5k6aa->lock); > + > + if (!on == s5k6aa->power) { > + if (on) { > + ret = __s5k6aa_power_enable(s5k6aa); > + if (!ret) > + ret = s5k6aa_initialize_isp(sd); > + } else { > + ret = __s5k6aa_power_disable(s5k6aa); > + } > + } > + if (!ret && !WARN_ON(s5k6aa->power < 0)) > + s5k6aa->power += on ? 1 : -1; > + mutex_unlock(&s5k6aa->lock); > + > + if (!ret && on && s5k6aa->power == 1) > + return v4l2_ctrl_handler_setup(sd->ctrl_handler); > + > + return ret; > +} > + > +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + int ret; > + > + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); > + if (!ret) > + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); > + if (!ret) > + s5k6aa->streaming = enable; > + > + return ret; > +} > + > +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret = 0; > + > + mutex_lock(&s5k6aa->lock); Stupid question perhaps, but why do you need a lock? Usually these calls are serialized by the bridge driver. Most subdevs don't use a lock, unless they start some thread of their own. > + > + if (!s5k6aa->streaming == !on) { > + mutex_unlock(&s5k6aa->lock); > + return 0; > + } > + if (s5k6aa->apply_new_cfg) > + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); > + if (!ret) > + ret = __s5k6aa_stream(s5k6aa, !!on); > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + memset(fi->reserved, 0, sizeof(fi->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + fi->interval = s5k6aa->fiv->interval; > + mutex_unlock(&s5k6aa->lock); > + > + return 0; > +} > + > +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct v4l2_frmsize_discrete *out_win = &s5k6aa->preset->out_size; > + const struct s5k6aa_interval *fiv = &s5k6aa_intervals[0]; > + unsigned int err, min_err = UINT_MAX; > + unsigned int i, fr_time; > + > + if (fi->interval.denominator == 0) > + return -EINVAL; > + > + memset(fi->reserved, 0, sizeof(fi->reserved)); > + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa_intervals); i++) { > + const struct s5k6aa_interval *iv = &s5k6aa_intervals[i]; > + > + if (out_win->width > iv->size.width || > + out_win->height > iv->size.height) > + continue; > + > + err = abs(iv->reg_fr_time - fr_time); > + if (err < min_err) { > + fiv = iv; > + min_err = err; > + } > + } > + s5k6aa->fiv = fiv; > + > + v4l2_dbg(1, debug, &s5k6aa->sd, "Changed frame interval to %d us\n", > + fiv->reg_fr_time * 100); > + return 0; > +} > + > +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_frame_interval *fi) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", > + fi->interval.numerator, fi->interval.denominator); > + > + mutex_lock(&s5k6aa->lock); > + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); > + s5k6aa->apply_new_cfg = 1; > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +/* > + * V4L2 subdev pad level operations > + */ > +static int s5k6aa_enum_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_frame_interval_enum *fie) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + const struct s5k6aa_interval *fi; > + int ret = 0; > + > + if (fie->index > ARRAY_SIZE(s5k6aa_intervals)) > + return -EINVAL; > + > + memset(fie->reserved, 0, sizeof(fie->reserved)); > + > + v4l_bound_align_image(&fie->width, S5K6AA_WIN_WIDTH_MIN, > + S5K6AA_WIN_WIDTH_MAX, 1, > + &fie->height, S5K6AA_WIN_HEIGHT_MIN, > + S5K6AA_WIN_HEIGHT_MAX, 1, 0); > + > + mutex_lock(&s5k6aa->lock); > + fi = &s5k6aa_intervals[fie->index]; > + if (fie->width > fi->size.width || fie->height > fi->size.height) > + ret = -EINVAL; > + else > + fie->interval = fi->interval; > + mutex_unlock(&s5k6aa->lock); > + > + return ret; > +} > + > +static int s5k6aa_enum_mbus_code(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_mbus_code_enum *code) > +{ > + if (code->index >= ARRAY_SIZE(s5k6aa_formats)) > + return -EINVAL; > + > + code->code = s5k6aa_formats[code->index].code; > + return 0; > +} > + > +static int s5k6aa_enum_frame_size(struct v4l2_subdev *sd, > + struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + int i = ARRAY_SIZE(s5k6aa_formats); > + > + if (fse->index > 0) > + return -EINVAL; > + > + while (--i) > + if (fse->code == s5k6aa_formats[i].code) > + break; > + > + fse->code = s5k6aa_formats[i].code; > + memset(fse->reserved, 0, sizeof(fse->reserved)); > + > + fse->min_width = S5K6AA_WIN_WIDTH_MIN; > + fse->max_width = S5K6AA_WIN_WIDTH_MAX; > + fse->max_height = S5K6AA_WIN_HEIGHT_MIN; > + fse->min_height = S5K6AA_WIN_HEIGHT_MAX; > + > + return 0; > +} > + > +static const struct s5k6aa_pixfmt *s5k6aa_try_format(struct s5k6aa *s5k6aa, > + struct v4l2_mbus_framefmt *mf) > +{ > + int i; > + > + v4l_bound_align_image(&mf->width, S5K6AA_WIN_WIDTH_MIN, > + S5K6AA_WIN_WIDTH_MAX, 1, > + &mf->height, S5K6AA_WIN_HEIGHT_MIN, > + S5K6AA_WIN_HEIGHT_MAX, 1, 0); > + > + if (mf->colorspace != V4L2_COLORSPACE_JPEG && > + mf->colorspace != V4L2_COLORSPACE_REC709) > + mf->colorspace = V4L2_COLORSPACE_JPEG; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa_formats); i++) { > + if (mf->colorspace == s5k6aa_formats[i].colorspace && > + mf->code == s5k6aa_formats[i].code) > + return &s5k6aa_formats[i]; > + } > + mf->colorspace = s5k6aa_formats[0].colorspace; > + mf->code = s5k6aa_formats[0].code; > + > + return &s5k6aa_formats[0]; > +} > + > +static int s5k6aa_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + struct s5k6aa_preset *preset = s5k6aa->preset; > + struct s5k6aa_pixfmt const *pixfmt; > + struct v4l2_mbus_framefmt *mf; > + int ret = 0; > + > + pixfmt = s5k6aa_try_format(s5k6aa, &fmt->format); > + > + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > + if (fh) { > + mf = v4l2_subdev_get_try_format(fh, fmt->pad); > + *mf = fmt->format; > + } > + return 0; > + } > + memset(fmt->reserved, 0, sizeof(fmt->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + mf = &fmt->format; > + if (!s5k6aa->streaming) { > + preset->pixfmt = pixfmt; > + preset->out_size.width = mf->width; > + preset->out_size.height = mf->height; > + s5k6aa->apply_new_cfg = 1; > + } else { > + ret = -EBUSY; > + } > + > + v4l2_dbg(1, debug, sd, "Resolution: %dx%d (%d)\n", > + mf->width, mf->height, s5k6aa->streaming); > + > + /* Reset to minimum possible frame interval */ > + if (!ret) { > + struct v4l2_subdev_frame_interval fiv = { > + .interval = {0, 1} > + }; > + ret = __s5k6aa_set_frame_interval(s5k6aa, &fiv); > + } > + > + mutex_unlock(&s5k6aa->lock); > + return ret; > +} > + > +static void s5k6aa_get_preset_fmt(struct s5k6aa_preset *preset, > + struct v4l2_mbus_framefmt *mf) > +{ > + mf->colorspace = preset->pixfmt->colorspace; > + mf->code = preset->pixfmt->code; > + mf->field = V4L2_FIELD_NONE; > + mf->width = preset->out_size.width; > + mf->height = preset->out_size.height; > +} > + > +static int s5k6aa_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, > + struct v4l2_subdev_format *fmt) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { > + if (fh) { > + struct v4l2_mbus_framefmt *mf; > + mf = v4l2_subdev_get_try_format(fh, 0); > + fmt->format = *mf; > + } > + return 0; > + } > + memset(fmt->reserved, 0, sizeof(fmt->reserved)); > + > + mutex_lock(&s5k6aa->lock); > + s5k6aa_get_preset_fmt(s5k6aa->preset, &fmt->format); > + mutex_unlock(&s5k6aa->lock); > + return 0; > +} > + > +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { > + .enum_mbus_code = s5k6aa_enum_mbus_code, > + .enum_frame_size = s5k6aa_enum_frame_size, > + .enum_frame_interval = s5k6aa_enum_frame_interval, > + .get_fmt = s5k6aa_get_fmt, > + .set_fmt = s5k6aa_set_fmt, > +}; > + > +/* > + * V4L2 subdev control operations > + */ > +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) > +{ > + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); > + struct i2c_client *c = v4l2_get_subdevdata(sd); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int pid, err = 0; > + > + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", > + __func__, ctrl->id, ctrl->val); > + > + mutex_lock(&s5k6aa->lock); > + /* > + * If the device is not powered up by the host driver do > + * not apply any controls to H/W at this time. Instead > + * the controls will be restored right after power-up. > + */ > + if (s5k6aa->power == 0) > + goto unlock; > + pid = s5k6aa->preset->index; > + > + switch (ctrl->id) { > + case V4L2_CID_BRIGHTNESS: > + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); > + break; > + > + case V4L2_CID_COLORFX: > + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_CONTRAST: > + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); > + break; > + > + case V4L2_CID_EXPOSURE_AUTO: > + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_HFLIP: > + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_POWER_LINE_FREQUENCY: > + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); > + break; > + > + case V4L2_CID_SATURATION: > + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); > + break; > + > + case V4L2_CID_SHARPNESS: > + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); > + break; > + > + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: > + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); > + break; > + } > + /* This should be really called once per all controls update > + rather than per each control. */ > + if (!err) > + err = s5k6aa_sync_preview_preset(c, 0); > +unlock: > + mutex_unlock(&s5k6aa->lock); > + return err; > +} > + > +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { > + .s_ctrl = s5k6aa_s_ctrl, > +}; > + > +static int s5k6aa_log_status(struct v4l2_subdev *sd) > +{ > + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); > + return 0; > +} > + > +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { > + .g_frame_interval = s5k6aa_g_frame_interval, > + .s_frame_interval = s5k6aa_s_frame_interval, > + .s_stream = s5k6aa_s_stream, > +}; > + > +/* > + * V4L2 subdev internal operations > + */ > +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) > +{ > + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); > + > + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); > + return 0; > +} > + > +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > + u16 api_ver = 0, fw_rev = 0; > + > + int ret = s5k6aa_set_ahb_address(client); > + > + if (!ret) > + ret = s5k6aa_read(client, REG_FW_APIVER, &api_ver); > + if (!ret) > + ret = s5k6aa_read(client, REG_FW_REVISION, &fw_rev); > + if (ret) { > + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); > + return ret; > + } > + > + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", > + api_ver, fw_rev); > + > + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; > +} > + > +static int s5k6aa_registered(struct v4l2_subdev *sd) > +{ > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + int ret; > + > + mutex_lock(&s5k6aa->lock); > + ret = __s5k6aa_power_enable(s5k6aa); > + if (!ret) { > + msleep(100); > + ret = s5k6aa_check_fw_revision(s5k6aa); > + __s5k6aa_power_disable(s5k6aa); > + } > + mutex_unlock(&s5k6aa->lock); > + > + return ret; > +} > + > +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { > + .registered = s5k6aa_registered, > + .open = s5k6aa_open, > +}; > + > +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { > + .s_power = s5k6aa_set_power, > + .g_ctrl = v4l2_subdev_g_ctrl, > + .s_ctrl = v4l2_subdev_s_ctrl, > + .queryctrl = v4l2_subdev_queryctrl, > + .querymenu = v4l2_subdev_querymenu, > + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, > + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, > + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, Don't add these control ops. They are only needed if this subdev driver is used by bridge drivers that are not yet converted to the control framework. That's not the case, so just remove these ops here. > + .log_status = s5k6aa_log_status, > +}; > + > +static const struct v4l2_subdev_ops s5k6aa_subdev_ops = { > + .core = &s5k6aa_core_ops, > + .pad = &s5k6aa_pad_ops, > + .video = &s5k6aa_video_ops, > +}; > + > +static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa) > +{ > + const struct v4l2_ctrl_ops *ops = &s5k6aa_ctrl_ops; > + struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls; > + struct v4l2_ctrl_handler *hdl = &ctrls->handler; > + > + int ret = v4l2_ctrl_handler_init(hdl, 12); > + if (ret) > + return ret; > + > + ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0); > + ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0); > + v4l2_ctrl_cluster(2, &ctrls->hflip); > + > + ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops, > + V4L2_CID_EXPOSURE_AUTO, > + V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); > + /* Exposure time: x 1 us */ > + ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE, > + 0, 6000000U, 1, 100000U); > + /* Total gain: 256 <=> 1x */ > + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, > + 0, 256, 1, 256); > + v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 0, false); Auto-cluster support. Lovely! :-) > + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY, > + V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0, > + V4L2_CID_POWER_LINE_FREQUENCY_AUTO); > + > + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX, > + V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE); > + > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE, > + 0, 256, 1, 0); > + > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0); > + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0); > + > + if (hdl->error) { > + ret = hdl->error; > + v4l2_ctrl_handler_free(hdl); > + return ret; > + } > + > + s5k6aa->sd.ctrl_handler = hdl; > + return 0; > +} > + > +/* > + * GPIO setup > + */ > +static int s5k6aa_configure_gpio(int nr, int val, const char *name) > +{ > + unsigned long flags = val ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW; > + int ret; > + > + if (!gpio_is_valid(nr)) > + return 0; > + ret = gpio_request_one(nr, flags, name); > + if (!ret) > + gpio_export(nr, 0); > + return ret; > +} > + > +static void s5k6aa_free_gpios(struct s5k6aa *s5k6aa) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(s5k6aa->gpio); i++) { > + if (!gpio_is_valid(s5k6aa->gpio[i].gpio)) > + continue; > + gpio_free(s5k6aa->gpio[i].gpio); > + s5k6aa->gpio[i].gpio = -EINVAL; > + } > +} > + > +static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa, > + const struct s5k6aa_platform_data *pdata) > +{ > + const struct s5k6aa_gpio *gpio = &pdata->gpio_stby; > + int ret; > + > + s5k6aa->gpio[STBY].gpio = -EINVAL; > + s5k6aa->gpio[RST].gpio = -EINVAL; > + > + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_STBY"); > + if (ret) { > + s5k6aa_free_gpios(s5k6aa); > + return ret; > + } > + s5k6aa->gpio[STBY] = *gpio; > + if (gpio_is_valid(gpio->gpio)) > + gpio_set_value(gpio->gpio, 0); > + > + gpio = &pdata->gpio_reset; > + ret = s5k6aa_configure_gpio(gpio->gpio, gpio->level, "S5K6AA_RST"); > + if (ret) { > + s5k6aa_free_gpios(s5k6aa); > + return ret; > + } > + s5k6aa->gpio[RST] = *gpio; > + if (gpio_is_valid(gpio->gpio)) > + gpio_set_value(gpio->gpio, 0); > + > + return 0; > +} > + > +static int s5k6aa_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + const struct s5k6aa_platform_data *pdata = client->dev.platform_data; > + struct v4l2_subdev *sd; > + struct s5k6aa *s5k6aa; > + int i, ret; > + > + if (pdata == NULL) { > + dev_err(&client->dev, "Platform data not specified\n"); > + return -EINVAL; > + } > + > + if (pdata->mclk_frequency == 0) { > + dev_err(&client->dev, "MCLK frequency not specified\n"); > + return -EINVAL; > + } > + > + s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); > + if (!s5k6aa) > + return -ENOMEM; > + > + mutex_init(&s5k6aa->lock); > + s5k6aa->mclk_frequency = pdata->mclk_frequency; > + s5k6aa->bus_type = pdata->bus_type; > + s5k6aa->mipi_lanes = pdata->nlanes; > + s5k6aa->s_power = pdata->set_power; > + > + sd = &s5k6aa->sd; > + strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name)); > + v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops); > + > + sd->internal_ops = &s5k6aa_subdev_internal_ops; > + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > + > + s5k6aa->pad.flags = MEDIA_PAD_FL_SOURCE; > + sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; > + ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); > + if (ret) > + goto out_err1; > + > + ret = s5k6aa_configure_gpios(s5k6aa, pdata); > + if (ret) > + goto out_err2; > + > + for (i = 0; i < S5K6AA_NUM_SUPPLIES; i++) > + s5k6aa->supplies[i].supply = s5k6aa_supply_names[i]; > + > + ret = regulator_bulk_get(&client->dev, S5K6AA_NUM_SUPPLIES, > + s5k6aa->supplies); > + if (ret) { > + dev_err(&client->dev, "Failed to get regulators\n"); > + goto out_err2; > + } > + > + ret = s5k6aa_initialize_ctrls(s5k6aa); > + if (ret) > + goto out_err3; > + > + s5k6aa_presets_data_init(s5k6aa, pdata->horiz_flip, > + pdata->vert_flip); > + return 0; > + > +out_err3: > + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > +out_err2: > + media_entity_cleanup(&s5k6aa->sd.entity); > +out_err1: > + kfree(s5k6aa); > + return ret; > +} > + > +static int s5k6aa_remove(struct i2c_client *client) > +{ > + struct v4l2_subdev *sd = i2c_get_clientdata(client); > + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > + > + v4l2_device_unregister_subdev(sd); > + v4l2_ctrl_handler_free(sd->ctrl_handler); > + media_entity_cleanup(&sd->entity); > + regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); > + s5k6aa_free_gpios(s5k6aa); > + kfree(s5k6aa); > + > + return 0; > +} > + > +static const struct i2c_device_id s5k6aa_id[] = { > + { DRIVER_NAME, 0 }, > + { }, > +}; > +MODULE_DEVICE_TABLE(i2c, s5k6aa_id); > + > + > +static struct i2c_driver s5k6aa_i2c_driver = { > + .driver = { > + .name = DRIVER_NAME > + }, > + .probe = s5k6aa_probe, > + .remove = s5k6aa_remove, > + .id_table = s5k6aa_id, > +}; > + > +static int __init s5k6aa_init(void) > +{ > + return i2c_add_driver(&s5k6aa_i2c_driver); > +} > + > +static void __exit s5k6aa_exit(void) > +{ > + i2c_del_driver(&s5k6aa_i2c_driver); > +} > + > +module_init(s5k6aa_init); > +module_exit(s5k6aa_exit); > + > +MODULE_DESCRIPTION("Samsung S5K6AA(FX) SXGA camera driver"); > +MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/include/media/s5k6aa.h b/include/media/s5k6aa.h > new file mode 100644 > index 0000000..a7c3dd4 > --- /dev/null > +++ b/include/media/s5k6aa.h > @@ -0,0 +1,51 @@ > +/* > + * S5K6AAFX camera sensor driver header > + * > + * Copyright (C) 2011 Samsung Electronics Co., Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#ifndef S5K6AA_H > +#define S5K6AA_H > + > +#include <media/v4l2-mediabus.h> > + > +/** > + * struct s5k6aa_gpio - data structure describing a GPIO > + * @gpio: GPIO number > + * @level: indicates active state of the @gpio > + */ > +struct s5k6aa_gpio { > + int gpio; > + int level; > +}; > + > +/** > + * struct s5k6aa_platform_data - s5k6aa driver platform data > + * @set_power: an additional callback to the board code, called > + * after enabling the regulators and before switching > + * the sensor off > + * @mclk_frequency: sensor's master clock frequency in Hz > + * @gpio_nreset: GPIO driving RESET pin > + * @gpio_nstby: GPIO driving STBY pin > + * @nlanes: maximum number of MIPI-CSI lanes used > + * @horiz_flip: default horizontal image flip value, non zero to enable > + * @vert_flip: default vertical image flip value, non zero to enable > + */ > + > +struct s5k6aa_platform_data { > + int (*set_power)(int enable); > + unsigned long mclk_frequency; > + struct s5k6aa_gpio gpio_reset; > + struct s5k6aa_gpio gpio_stby; > + enum v4l2_mbus_type bus_type; > + u8 nlanes; > + u8 horiz_flip; > + u8 vert_flip; > +}; > + > +#endif /* S5K6AA_H */ > Regards, Hans ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-26 13:21 ` Hans Verkuil @ 2011-09-26 21:49 ` Sylwester Nawrocki 2011-09-27 7:14 ` Hans Verkuil 0 siblings, 1 reply; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-26 21:49 UTC (permalink / raw) To: Hans Verkuil Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim Hi Hans, thanks for the comments. It's good to see you back, this mailing list had been much more quiet when you've been away for a while;) I hope everything got well for you. On 09/26/2011 03:21 PM, Hans Verkuil wrote: > On Wednesday, September 21, 2011 19:45:07 Sylwester Nawrocki wrote: >> This driver exposes preview mode operation of the S5K6AAFX sensor with >> embedded SoC ISP. It uses one of the five user predefined configuration >> register sets. There is yet no support for capture (snapshot) operation. >> Following controls are supported: >> manual/auto exposure and gain, power line frequency (anti-flicker), >> saturation, sharpness, brightness, contrast, white balance temperature, >> color effects, horizontal/vertical image flip, frame interval. >> >> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >> --- ... >> +/* >> + * V4L2 subdev core and video operations >> + */ >> +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) >> +{ >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + int ret = 0; >> + >> + mutex_lock(&s5k6aa->lock); >> + >> + if (!on == s5k6aa->power) { >> + if (on) { >> + ret = __s5k6aa_power_enable(s5k6aa); >> + if (!ret) >> + ret = s5k6aa_initialize_isp(sd); >> + } else { >> + ret = __s5k6aa_power_disable(s5k6aa); >> + } >> + } >> + if (!ret&& !WARN_ON(s5k6aa->power< 0)) >> + s5k6aa->power += on ? 1 : -1; >> + mutex_unlock(&s5k6aa->lock); >> + >> + if (!ret&& on&& s5k6aa->power == 1) >> + return v4l2_ctrl_handler_setup(sd->ctrl_handler); >> + >> + return ret; >> +} >> + >> +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) >> +{ >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >> + int ret; >> + >> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); >> + if (!ret) >> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); >> + if (!ret) >> + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); >> + if (!ret) >> + s5k6aa->streaming = enable; >> + >> + return ret; >> +} >> + >> +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) >> +{ >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + int ret = 0; >> + >> + mutex_lock(&s5k6aa->lock); > > Stupid question perhaps, but why do you need a lock? Usually these calls are > serialized by the bridge driver. Most subdevs don't use a lock, unless they > start some thread of their own. I wish I could get rid of the lock, but it seems necessary as long as the device can be accessed through two device nodes: /dev/video? and /dev/v4l-subdev?. It holds mostly for s_ctrl, which can be called on the subdev node, the other subdev ops generally don't attempt to access I2C. So this lock is also an I2C interface mutex ensuring correct configuration registers read/write sequences. Especially nothing should be allowed to interfere with the ISP initialization routine, which is executed through s_power op at the time of /dev/video? open(). Yes, adding device node to subdevs made things slightly more complicated :) I wonder how other subdevs resolve the serialization without a lock. > >> + >> + if (!s5k6aa->streaming == !on) { >> + mutex_unlock(&s5k6aa->lock); >> + return 0; >> + } >> + if (s5k6aa->apply_new_cfg) >> + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); >> + if (!ret) >> + ret = __s5k6aa_stream(s5k6aa, !!on); >> + >> + mutex_unlock(&s5k6aa->lock); >> + return ret; >> +} >> + >> +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, >> + struct v4l2_subdev_frame_interval *fi) >> +{ >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + >> + memset(fi->reserved, 0, sizeof(fi->reserved)); >> + >> + mutex_lock(&s5k6aa->lock); >> + fi->interval = s5k6aa->fiv->interval; >> + mutex_unlock(&s5k6aa->lock); >> + >> + return 0; >> +} >> + >> +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, >> + struct v4l2_subdev_frame_interval *fi) >> +{ >> + struct v4l2_frmsize_discrete *out_win =&s5k6aa->preset->out_size; >> + const struct s5k6aa_interval *fiv =&s5k6aa_intervals[0]; >> + unsigned int err, min_err = UINT_MAX; >> + unsigned int i, fr_time; >> + >> + if (fi->interval.denominator == 0) >> + return -EINVAL; >> + >> + memset(fi->reserved, 0, sizeof(fi->reserved)); >> + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; >> + >> + for (i = 0; i< ARRAY_SIZE(s5k6aa_intervals); i++) { >> + const struct s5k6aa_interval *iv =&s5k6aa_intervals[i]; >> + >> + if (out_win->width> iv->size.width || >> + out_win->height> iv->size.height) >> + continue; >> + >> + err = abs(iv->reg_fr_time - fr_time); >> + if (err< min_err) { >> + fiv = iv; >> + min_err = err; >> + } >> + } >> + s5k6aa->fiv = fiv; >> + >> + v4l2_dbg(1, debug,&s5k6aa->sd, "Changed frame interval to %d us\n", >> + fiv->reg_fr_time * 100); >> + return 0; >> +} >> + >> +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, >> + struct v4l2_subdev_frame_interval *fi) >> +{ >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + int ret; >> + >> + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", >> + fi->interval.numerator, fi->interval.denominator); >> + >> + mutex_lock(&s5k6aa->lock); >> + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); >> + s5k6aa->apply_new_cfg = 1; >> + >> + mutex_unlock(&s5k6aa->lock); >> + return ret; >> +} >> + ... >> +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { >> + .enum_mbus_code = s5k6aa_enum_mbus_code, >> + .enum_frame_size = s5k6aa_enum_frame_size, >> + .enum_frame_interval = s5k6aa_enum_frame_interval, >> + .get_fmt = s5k6aa_get_fmt, >> + .set_fmt = s5k6aa_set_fmt, >> +}; >> + >> +/* >> + * V4L2 subdev control operations >> + */ >> +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) >> +{ >> + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); >> + struct i2c_client *c = v4l2_get_subdevdata(sd); >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + int pid, err = 0; >> + >> + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", >> + __func__, ctrl->id, ctrl->val); >> + >> + mutex_lock(&s5k6aa->lock); >> + /* >> + * If the device is not powered up by the host driver do >> + * not apply any controls to H/W at this time. Instead >> + * the controls will be restored right after power-up. >> + */ >> + if (s5k6aa->power == 0) >> + goto unlock; >> + pid = s5k6aa->preset->index; >> + >> + switch (ctrl->id) { >> + case V4L2_CID_BRIGHTNESS: >> + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); >> + break; >> + >> + case V4L2_CID_COLORFX: >> + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); >> + break; >> + >> + case V4L2_CID_CONTRAST: >> + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); >> + break; >> + >> + case V4L2_CID_EXPOSURE_AUTO: >> + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); >> + break; >> + >> + case V4L2_CID_HFLIP: >> + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); >> + break; >> + >> + case V4L2_CID_POWER_LINE_FREQUENCY: >> + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); >> + break; >> + >> + case V4L2_CID_SATURATION: >> + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); >> + break; >> + >> + case V4L2_CID_SHARPNESS: >> + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); >> + break; >> + >> + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: >> + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); >> + break; >> + } >> + /* This should be really called once per all controls update >> + rather than per each control. */ >> + if (!err) >> + err = s5k6aa_sync_preview_preset(c, 0); >> +unlock: >> + mutex_unlock(&s5k6aa->lock); >> + return err; >> +} >> + >> +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { >> + .s_ctrl = s5k6aa_s_ctrl, >> +}; >> + >> +static int s5k6aa_log_status(struct v4l2_subdev *sd) >> +{ >> + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); >> + return 0; >> +} >> + >> +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { >> + .g_frame_interval = s5k6aa_g_frame_interval, >> + .s_frame_interval = s5k6aa_s_frame_interval, >> + .s_stream = s5k6aa_s_stream, >> +}; >> + >> +/* >> + * V4L2 subdev internal operations >> + */ >> +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) >> +{ >> + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); >> + >> + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); >> + return 0; >> +} >> + >> +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) >> +{ >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >> + u16 api_ver = 0, fw_rev = 0; >> + >> + int ret = s5k6aa_set_ahb_address(client); >> + >> + if (!ret) >> + ret = s5k6aa_read(client, REG_FW_APIVER,&api_ver); >> + if (!ret) >> + ret = s5k6aa_read(client, REG_FW_REVISION,&fw_rev); >> + if (ret) { >> + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); >> + return ret; >> + } >> + >> + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", >> + api_ver, fw_rev); >> + >> + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; >> +} >> + >> +static int s5k6aa_registered(struct v4l2_subdev *sd) >> +{ >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >> + int ret; >> + >> + mutex_lock(&s5k6aa->lock); >> + ret = __s5k6aa_power_enable(s5k6aa); >> + if (!ret) { >> + msleep(100); >> + ret = s5k6aa_check_fw_revision(s5k6aa); >> + __s5k6aa_power_disable(s5k6aa); >> + } >> + mutex_unlock(&s5k6aa->lock); >> + >> + return ret; >> +} >> + >> +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { >> + .registered = s5k6aa_registered, >> + .open = s5k6aa_open, >> +}; >> + >> +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { >> + .s_power = s5k6aa_set_power, >> + .g_ctrl = v4l2_subdev_g_ctrl, >> + .s_ctrl = v4l2_subdev_s_ctrl, >> + .queryctrl = v4l2_subdev_queryctrl, >> + .querymenu = v4l2_subdev_querymenu, >> + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, >> + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, >> + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, > > Don't add these control ops. They are only needed if this subdev driver is > used by bridge drivers that are not yet converted to the control framework. > That's not the case, so just remove these ops here. Great! thanks for the hint. I've just added this to the list of changes for v3. > >> + .log_status = s5k6aa_log_status, Do we plan to support this op directly on subdev nodes ? Or should it be only accessible through bridge drivers ? I was just wondering if we should add VIDIOC_LOG_STATUS to subdev_do_ioctl(). >> +}; >> + >> +static const struct v4l2_subdev_ops s5k6aa_subdev_ops = { >> + .core =&s5k6aa_core_ops, >> + .pad =&s5k6aa_pad_ops, >> + .video =&s5k6aa_video_ops, >> +}; >> + >> +static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa) >> +{ >> + const struct v4l2_ctrl_ops *ops =&s5k6aa_ctrl_ops; >> + struct s5k6aa_ctrls *ctrls =&s5k6aa->ctrls; >> + struct v4l2_ctrl_handler *hdl =&ctrls->handler; >> + >> + int ret = v4l2_ctrl_handler_init(hdl, 12); >> + if (ret) >> + return ret; >> + >> + ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0); >> + ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0); >> + v4l2_ctrl_cluster(2,&ctrls->hflip); >> + >> + ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops, >> + V4L2_CID_EXPOSURE_AUTO, >> + V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); >> + /* Exposure time: x 1 us */ >> + ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE, >> + 0, 6000000U, 1, 100000U); >> + /* Total gain: 256<=> 1x */ >> + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, >> + 0, 256, 1, 256); >> + v4l2_ctrl_auto_cluster(3,&ctrls->auto_exp, 0, false); > > Auto-cluster support. Lovely! :-) Yes, there is one more I work on - auto white balance / RGB gains one. But I left this for the next step. Can't really invest much time for these things currently. > >> + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY, >> + V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0, >> + V4L2_CID_POWER_LINE_FREQUENCY_AUTO); >> + >> + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX, >> + V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE); >> + >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE, >> + 0, 256, 1, 0); >> + >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0); >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0); >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0); >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0); >> + >> + if (hdl->error) { >> + ret = hdl->error; >> + v4l2_ctrl_handler_free(hdl); >> + return ret; >> + } >> + >> + s5k6aa->sd.ctrl_handler = hdl; >> + return 0; >> +} >> + -- Regards, Sylwester ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-26 21:49 ` Sylwester Nawrocki @ 2011-09-27 7:14 ` Hans Verkuil 2011-09-27 8:07 ` Sylwester Nawrocki 0 siblings, 1 reply; 19+ messages in thread From: Hans Verkuil @ 2011-09-27 7:14 UTC (permalink / raw) To: Sylwester Nawrocki Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim On Monday, September 26, 2011 23:49:56 Sylwester Nawrocki wrote: > Hi Hans, > > thanks for the comments. It's good to see you back, this mailing list > had been much more quiet when you've been away for a while;) > I hope everything got well for you. > > On 09/26/2011 03:21 PM, Hans Verkuil wrote: > > On Wednesday, September 21, 2011 19:45:07 Sylwester Nawrocki wrote: > >> This driver exposes preview mode operation of the S5K6AAFX sensor with > >> embedded SoC ISP. It uses one of the five user predefined configuration > >> register sets. There is yet no support for capture (snapshot) operation. > >> Following controls are supported: > >> manual/auto exposure and gain, power line frequency (anti-flicker), > >> saturation, sharpness, brightness, contrast, white balance temperature, > >> color effects, horizontal/vertical image flip, frame interval. > >> > >> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> > >> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> > >> --- > ... > >> +/* > >> + * V4L2 subdev core and video operations > >> + */ > >> +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) > >> +{ > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + int ret = 0; > >> + > >> + mutex_lock(&s5k6aa->lock); > >> + > >> + if (!on == s5k6aa->power) { > >> + if (on) { > >> + ret = __s5k6aa_power_enable(s5k6aa); > >> + if (!ret) > >> + ret = s5k6aa_initialize_isp(sd); > >> + } else { > >> + ret = __s5k6aa_power_disable(s5k6aa); > >> + } > >> + } > >> + if (!ret&& !WARN_ON(s5k6aa->power< 0)) > >> + s5k6aa->power += on ? 1 : -1; > >> + mutex_unlock(&s5k6aa->lock); > >> + > >> + if (!ret&& on&& s5k6aa->power == 1) > >> + return v4l2_ctrl_handler_setup(sd->ctrl_handler); > >> + > >> + return ret; > >> +} > >> + > >> +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) > >> +{ > >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > >> + int ret; > >> + > >> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); > >> + if (!ret) > >> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); > >> + if (!ret) > >> + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); > >> + if (!ret) > >> + s5k6aa->streaming = enable; > >> + > >> + return ret; > >> +} > >> + > >> +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) > >> +{ > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + int ret = 0; > >> + > >> + mutex_lock(&s5k6aa->lock); > > > > Stupid question perhaps, but why do you need a lock? Usually these calls are > > serialized by the bridge driver. Most subdevs don't use a lock, unless they > > start some thread of their own. > > I wish I could get rid of the lock, but it seems necessary as long as the device > can be accessed through two device nodes: /dev/video? and /dev/v4l-subdev?. Ah yes, that's true. > It holds mostly for s_ctrl, which can be called on the subdev node, the other > subdev ops generally don't attempt to access I2C. The control framework has its own locking, so s_ctrl is guaranteed to be serialized. So you don't need to lock there. > So this lock is also an I2C interface mutex ensuring correct configuration > registers read/write sequences. Especially nothing should be allowed to interfere > with the ISP initialization routine, which is executed through s_power op at > the time of /dev/video? open(). > > Yes, adding device node to subdevs made things slightly more complicated :) I need to look at this some more: see if we can support the core locking mechanism for subdev nodes as well. > I wonder how other subdevs resolve the serialization without a lock. They don't have their own device node :-) > > > > >> + > >> + if (!s5k6aa->streaming == !on) { > >> + mutex_unlock(&s5k6aa->lock); > >> + return 0; > >> + } > >> + if (s5k6aa->apply_new_cfg) > >> + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); > >> + if (!ret) > >> + ret = __s5k6aa_stream(s5k6aa, !!on); > >> + > >> + mutex_unlock(&s5k6aa->lock); > >> + return ret; > >> +} > >> + > >> +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, > >> + struct v4l2_subdev_frame_interval *fi) > >> +{ > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + > >> + memset(fi->reserved, 0, sizeof(fi->reserved)); > >> + > >> + mutex_lock(&s5k6aa->lock); > >> + fi->interval = s5k6aa->fiv->interval; > >> + mutex_unlock(&s5k6aa->lock); > >> + > >> + return 0; > >> +} > >> + > >> +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, > >> + struct v4l2_subdev_frame_interval *fi) > >> +{ > >> + struct v4l2_frmsize_discrete *out_win =&s5k6aa->preset->out_size; > >> + const struct s5k6aa_interval *fiv =&s5k6aa_intervals[0]; > >> + unsigned int err, min_err = UINT_MAX; > >> + unsigned int i, fr_time; > >> + > >> + if (fi->interval.denominator == 0) > >> + return -EINVAL; > >> + > >> + memset(fi->reserved, 0, sizeof(fi->reserved)); > >> + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; > >> + > >> + for (i = 0; i< ARRAY_SIZE(s5k6aa_intervals); i++) { > >> + const struct s5k6aa_interval *iv =&s5k6aa_intervals[i]; > >> + > >> + if (out_win->width> iv->size.width || > >> + out_win->height> iv->size.height) > >> + continue; > >> + > >> + err = abs(iv->reg_fr_time - fr_time); > >> + if (err< min_err) { > >> + fiv = iv; > >> + min_err = err; > >> + } > >> + } > >> + s5k6aa->fiv = fiv; > >> + > >> + v4l2_dbg(1, debug,&s5k6aa->sd, "Changed frame interval to %d us\n", > >> + fiv->reg_fr_time * 100); > >> + return 0; > >> +} > >> + > >> +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, > >> + struct v4l2_subdev_frame_interval *fi) > >> +{ > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + int ret; > >> + > >> + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", > >> + fi->interval.numerator, fi->interval.denominator); > >> + > >> + mutex_lock(&s5k6aa->lock); > >> + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); > >> + s5k6aa->apply_new_cfg = 1; > >> + > >> + mutex_unlock(&s5k6aa->lock); > >> + return ret; > >> +} > >> + > ... > >> +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { > >> + .enum_mbus_code = s5k6aa_enum_mbus_code, > >> + .enum_frame_size = s5k6aa_enum_frame_size, > >> + .enum_frame_interval = s5k6aa_enum_frame_interval, > >> + .get_fmt = s5k6aa_get_fmt, > >> + .set_fmt = s5k6aa_set_fmt, > >> +}; > >> + > >> +/* > >> + * V4L2 subdev control operations > >> + */ > >> +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) > >> +{ > >> + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); > >> + struct i2c_client *c = v4l2_get_subdevdata(sd); > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + int pid, err = 0; > >> + > >> + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", > >> + __func__, ctrl->id, ctrl->val); > >> + > >> + mutex_lock(&s5k6aa->lock); > >> + /* > >> + * If the device is not powered up by the host driver do > >> + * not apply any controls to H/W at this time. Instead > >> + * the controls will be restored right after power-up. > >> + */ > >> + if (s5k6aa->power == 0) > >> + goto unlock; > >> + pid = s5k6aa->preset->index; > >> + > >> + switch (ctrl->id) { > >> + case V4L2_CID_BRIGHTNESS: > >> + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_COLORFX: > >> + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_CONTRAST: > >> + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_EXPOSURE_AUTO: > >> + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_HFLIP: > >> + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_POWER_LINE_FREQUENCY: > >> + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_SATURATION: > >> + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_SHARPNESS: > >> + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); > >> + break; > >> + > >> + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: > >> + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); > >> + break; > >> + } > >> + /* This should be really called once per all controls update > >> + rather than per each control. */ > >> + if (!err) > >> + err = s5k6aa_sync_preview_preset(c, 0); > >> +unlock: > >> + mutex_unlock(&s5k6aa->lock); > >> + return err; > >> +} > >> + > >> +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { > >> + .s_ctrl = s5k6aa_s_ctrl, > >> +}; > >> + > >> +static int s5k6aa_log_status(struct v4l2_subdev *sd) > >> +{ > >> + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); > >> + return 0; > >> +} > >> + > >> +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { > >> + .g_frame_interval = s5k6aa_g_frame_interval, > >> + .s_frame_interval = s5k6aa_s_frame_interval, > >> + .s_stream = s5k6aa_s_stream, > >> +}; > >> + > >> +/* > >> + * V4L2 subdev internal operations > >> + */ > >> +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) > >> +{ > >> + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); > >> + > >> + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); > >> + return 0; > >> +} > >> + > >> +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) > >> +{ > >> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); > >> + u16 api_ver = 0, fw_rev = 0; > >> + > >> + int ret = s5k6aa_set_ahb_address(client); > >> + > >> + if (!ret) > >> + ret = s5k6aa_read(client, REG_FW_APIVER,&api_ver); > >> + if (!ret) > >> + ret = s5k6aa_read(client, REG_FW_REVISION,&fw_rev); > >> + if (ret) { > >> + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); > >> + return ret; > >> + } > >> + > >> + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", > >> + api_ver, fw_rev); > >> + > >> + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; > >> +} > >> + > >> +static int s5k6aa_registered(struct v4l2_subdev *sd) > >> +{ > >> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); > >> + int ret; > >> + > >> + mutex_lock(&s5k6aa->lock); > >> + ret = __s5k6aa_power_enable(s5k6aa); > >> + if (!ret) { > >> + msleep(100); > >> + ret = s5k6aa_check_fw_revision(s5k6aa); > >> + __s5k6aa_power_disable(s5k6aa); > >> + } > >> + mutex_unlock(&s5k6aa->lock); > >> + > >> + return ret; > >> +} > >> + > >> +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { > >> + .registered = s5k6aa_registered, > >> + .open = s5k6aa_open, > >> +}; > >> + > >> +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { > >> + .s_power = s5k6aa_set_power, > >> + .g_ctrl = v4l2_subdev_g_ctrl, > >> + .s_ctrl = v4l2_subdev_s_ctrl, > >> + .queryctrl = v4l2_subdev_queryctrl, > >> + .querymenu = v4l2_subdev_querymenu, > >> + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, > >> + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, > >> + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, > > > > Don't add these control ops. They are only needed if this subdev driver is > > used by bridge drivers that are not yet converted to the control framework. > > That's not the case, so just remove these ops here. > > Great! thanks for the hint. I've just added this to the list of changes for v3. > > > > >> + .log_status = s5k6aa_log_status, > > Do we plan to support this op directly on subdev nodes ? Or should it be only > accessible through bridge drivers ? > I was just wondering if we should add VIDIOC_LOG_STATUS to subdev_do_ioctl(). We should. Just one of those things that we didn't get around to. Can you add it? Regards, Hans > >> +}; > >> + > >> +static const struct v4l2_subdev_ops s5k6aa_subdev_ops = { > >> + .core =&s5k6aa_core_ops, > >> + .pad =&s5k6aa_pad_ops, > >> + .video =&s5k6aa_video_ops, > >> +}; > >> + > >> +static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa) > >> +{ > >> + const struct v4l2_ctrl_ops *ops =&s5k6aa_ctrl_ops; > >> + struct s5k6aa_ctrls *ctrls =&s5k6aa->ctrls; > >> + struct v4l2_ctrl_handler *hdl =&ctrls->handler; > >> + > >> + int ret = v4l2_ctrl_handler_init(hdl, 12); > >> + if (ret) > >> + return ret; > >> + > >> + ctrls->hflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HFLIP, 0, 1, 1, 0); > >> + ctrls->vflip = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_VFLIP, 0, 1, 1, 0); > >> + v4l2_ctrl_cluster(2,&ctrls->hflip); > >> + > >> + ctrls->auto_exp = v4l2_ctrl_new_std_menu(hdl, ops, > >> + V4L2_CID_EXPOSURE_AUTO, > >> + V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO); > >> + /* Exposure time: x 1 us */ > >> + ctrls->exposure = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_EXPOSURE, > >> + 0, 6000000U, 1, 100000U); > >> + /* Total gain: 256<=> 1x */ > >> + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, > >> + 0, 256, 1, 256); > >> + v4l2_ctrl_auto_cluster(3,&ctrls->auto_exp, 0, false); > > > > Auto-cluster support. Lovely! :-) > > Yes, there is one more I work on - auto white balance / RGB gains one. > But I left this for the next step. Can't really invest much time for these > things currently. > > > > >> + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_POWER_LINE_FREQUENCY, > >> + V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0, > >> + V4L2_CID_POWER_LINE_FREQUENCY_AUTO); > >> + > >> + v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_COLORFX, > >> + V4L2_COLORFX_SKY_BLUE, ~0x6f, V4L2_COLORFX_NONE); > >> + > >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_WHITE_BALANCE_TEMPERATURE, > >> + 0, 256, 1, 0); > >> + > >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, -127, 127, 1, 0); > >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -127, 127, 1, 0); > >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -127, 127, 1, 0); > >> + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SHARPNESS, -127, 127, 1, 0); > >> + > >> + if (hdl->error) { > >> + ret = hdl->error; > >> + v4l2_ctrl_handler_free(hdl); > >> + return ret; > >> + } > >> + > >> + s5k6aa->sd.ctrl_handler = hdl; > >> + return 0; > >> +} > >> + > > -- > Regards, > Sylwester > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-09-27 7:14 ` Hans Verkuil @ 2011-09-27 8:07 ` Sylwester Nawrocki 0 siblings, 0 replies; 19+ messages in thread From: Sylwester Nawrocki @ 2011-09-27 8:07 UTC (permalink / raw) To: Hans Verkuil Cc: Sylwester Nawrocki, linux-media, m.szyprowski, kyungmin.park, laurent.pinchart, sakari.ailus, sw0312.kim, riverful.kim On 09/27/2011 09:14 AM, Hans Verkuil wrote: > On Monday, September 26, 2011 23:49:56 Sylwester Nawrocki wrote: >> Hi Hans, >> >> thanks for the comments. It's good to see you back, this mailing list >> had been much more quiet when you've been away for a while;) >> I hope everything got well for you. >> >> On 09/26/2011 03:21 PM, Hans Verkuil wrote: >>> On Wednesday, September 21, 2011 19:45:07 Sylwester Nawrocki wrote: >>>> This driver exposes preview mode operation of the S5K6AAFX sensor with >>>> embedded SoC ISP. It uses one of the five user predefined configuration >>>> register sets. There is yet no support for capture (snapshot) operation. >>>> Following controls are supported: >>>> manual/auto exposure and gain, power line frequency (anti-flicker), >>>> saturation, sharpness, brightness, contrast, white balance temperature, >>>> color effects, horizontal/vertical image flip, frame interval. >>>> >>>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com> >>>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> >>>> --- >> ... >>>> +/* >>>> + * V4L2 subdev core and video operations >>>> + */ >>>> +static int s5k6aa_set_power(struct v4l2_subdev *sd, int on) >>>> +{ >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + int ret = 0; >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>>> + >>>> + if (!on == s5k6aa->power) { >>>> + if (on) { >>>> + ret = __s5k6aa_power_enable(s5k6aa); >>>> + if (!ret) >>>> + ret = s5k6aa_initialize_isp(sd); >>>> + } else { >>>> + ret = __s5k6aa_power_disable(s5k6aa); >>>> + } >>>> + } >>>> + if (!ret&& !WARN_ON(s5k6aa->power< 0)) >>>> + s5k6aa->power += on ? 1 : -1; >>>> + mutex_unlock(&s5k6aa->lock); >>>> + >>>> + if (!ret&& on&& s5k6aa->power == 1) >>>> + return v4l2_ctrl_handler_setup(sd->ctrl_handler); >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable) >>>> +{ >>>> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >>>> + int ret; >>>> + >>>> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV, enable); >>>> + if (!ret) >>>> + ret = s5k6aa_write(client, REG_G_ENABLE_PREV_CHG, 1); >>>> + if (!ret) >>>> + ret = s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1); >>>> + if (!ret) >>>> + s5k6aa->streaming = enable; >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +static int s5k6aa_s_stream(struct v4l2_subdev *sd, int on) >>>> +{ >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + int ret = 0; >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>> >>> Stupid question perhaps, but why do you need a lock? Usually these calls are >>> serialized by the bridge driver. Most subdevs don't use a lock, unless they >>> start some thread of their own. >> >> I wish I could get rid of the lock, but it seems necessary as long as the device >> can be accessed through two device nodes: /dev/video? and /dev/v4l-subdev?. > > Ah yes, that's true. > >> It holds mostly for s_ctrl, which can be called on the subdev node, the other >> subdev ops generally don't attempt to access I2C. > > The control framework has its own locking, so s_ctrl is guaranteed to be serialized. Yup, I was aware of that. > So you don't need to lock there. I still need the I2C mutex there, which is used to serialize the device I2C interface access across various subdev ops, s_ctrl among others. > >> So this lock is also an I2C interface mutex ensuring correct configuration >> registers read/write sequences. Especially nothing should be allowed to interfere >> with the ISP initialization routine, which is executed through s_power op at >> the time of /dev/video? open(). >> >> Yes, adding device node to subdevs made things slightly more complicated :) > > I need to look at this some more: see if we can support the core locking > mechanism for subdev nodes as well. I think it could be useful to have an option to use the core lock. However I guess it's not easy to implement as the drivers are quite independent. Maybe it could be added somewhere around v4l2_device_register_subdev_nodes(). > >> I wonder how other subdevs resolve the serialization without a lock. > > They don't have their own device node :-) Some of them have, IIRC. > >> >>> >>>> + >>>> + if (!s5k6aa->streaming == !on) { >>>> + mutex_unlock(&s5k6aa->lock); >>>> + return 0; >>>> + } >>>> + if (s5k6aa->apply_new_cfg) >>>> + ret = s5k6aa_set_preview_preset(s5k6aa, s5k6aa->preset); >>>> + if (!ret) >>>> + ret = __s5k6aa_stream(s5k6aa, !!on); >>>> + >>>> + mutex_unlock(&s5k6aa->lock); >>>> + return ret; >>>> +} >>>> + >>>> +static int s5k6aa_g_frame_interval(struct v4l2_subdev *sd, >>>> + struct v4l2_subdev_frame_interval *fi) >>>> +{ >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + >>>> + memset(fi->reserved, 0, sizeof(fi->reserved)); >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>>> + fi->interval = s5k6aa->fiv->interval; >>>> + mutex_unlock(&s5k6aa->lock); >>>> + >>>> + return 0; >>>> +} >>>> + >>>> +static int __s5k6aa_set_frame_interval(struct s5k6aa *s5k6aa, >>>> + struct v4l2_subdev_frame_interval *fi) >>>> +{ >>>> + struct v4l2_frmsize_discrete *out_win =&s5k6aa->preset->out_size; >>>> + const struct s5k6aa_interval *fiv =&s5k6aa_intervals[0]; >>>> + unsigned int err, min_err = UINT_MAX; >>>> + unsigned int i, fr_time; >>>> + >>>> + if (fi->interval.denominator == 0) >>>> + return -EINVAL; >>>> + >>>> + memset(fi->reserved, 0, sizeof(fi->reserved)); >>>> + fr_time = fi->interval.numerator * 10000 / fi->interval.denominator; >>>> + >>>> + for (i = 0; i< ARRAY_SIZE(s5k6aa_intervals); i++) { >>>> + const struct s5k6aa_interval *iv =&s5k6aa_intervals[i]; >>>> + >>>> + if (out_win->width> iv->size.width || >>>> + out_win->height> iv->size.height) >>>> + continue; >>>> + >>>> + err = abs(iv->reg_fr_time - fr_time); >>>> + if (err< min_err) { >>>> + fiv = iv; >>>> + min_err = err; >>>> + } >>>> + } >>>> + s5k6aa->fiv = fiv; >>>> + >>>> + v4l2_dbg(1, debug,&s5k6aa->sd, "Changed frame interval to %d us\n", >>>> + fiv->reg_fr_time * 100); >>>> + return 0; >>>> +} >>>> + >>>> +static int s5k6aa_s_frame_interval(struct v4l2_subdev *sd, >>>> + struct v4l2_subdev_frame_interval *fi) >>>> +{ >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + int ret; >>>> + >>>> + v4l2_dbg(1, debug, sd, "Setting %d/%d frame interval\n", >>>> + fi->interval.numerator, fi->interval.denominator); >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>>> + ret = __s5k6aa_set_frame_interval(s5k6aa, fi); >>>> + s5k6aa->apply_new_cfg = 1; >>>> + >>>> + mutex_unlock(&s5k6aa->lock); >>>> + return ret; >>>> +} >>>> + >> ... >>>> +static const struct v4l2_subdev_pad_ops s5k6aa_pad_ops = { >>>> + .enum_mbus_code = s5k6aa_enum_mbus_code, >>>> + .enum_frame_size = s5k6aa_enum_frame_size, >>>> + .enum_frame_interval = s5k6aa_enum_frame_interval, >>>> + .get_fmt = s5k6aa_get_fmt, >>>> + .set_fmt = s5k6aa_set_fmt, >>>> +}; >>>> + >>>> +/* >>>> + * V4L2 subdev control operations >>>> + */ >>>> +static int s5k6aa_s_ctrl(struct v4l2_ctrl *ctrl) >>>> +{ >>>> + struct v4l2_subdev *sd = ctrl_to_sd(ctrl); >>>> + struct i2c_client *c = v4l2_get_subdevdata(sd); >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + int pid, err = 0; >>>> + >>>> + v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%x, value: %d\n", >>>> + __func__, ctrl->id, ctrl->val); >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>>> + /* >>>> + * If the device is not powered up by the host driver do >>>> + * not apply any controls to H/W at this time. Instead >>>> + * the controls will be restored right after power-up. >>>> + */ >>>> + if (s5k6aa->power == 0) >>>> + goto unlock; >>>> + pid = s5k6aa->preset->index; >>>> + >>>> + switch (ctrl->id) { >>>> + case V4L2_CID_BRIGHTNESS: >>>> + err = s5k6aa_write(c, REG_USER_BRIGHTNESS, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_COLORFX: >>>> + err = s5k6aa_set_colorfx(s5k6aa, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_CONTRAST: >>>> + err = s5k6aa_write(c, REG_USER_CONTRAST, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_EXPOSURE_AUTO: >>>> + err = s5k6aa_set_auto_exposure(s5k6aa, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_HFLIP: >>>> + err = s5k6aa_set_mirror(s5k6aa, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_POWER_LINE_FREQUENCY: >>>> + err = s5k6aa_set_anti_flicker(s5k6aa, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_SATURATION: >>>> + err = s5k6aa_write(c, REG_USER_SATURATION, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_SHARPNESS: >>>> + err = s5k6aa_write(c, REG_USER_SHARPBLUR, ctrl->val); >>>> + break; >>>> + >>>> + case V4L2_CID_WHITE_BALANCE_TEMPERATURE: >>>> + err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val); >>>> + break; >>>> + } >>>> + /* This should be really called once per all controls update >>>> + rather than per each control. */ >>>> + if (!err) >>>> + err = s5k6aa_sync_preview_preset(c, 0); >>>> +unlock: >>>> + mutex_unlock(&s5k6aa->lock); >>>> + return err; >>>> +} >>>> + >>>> +static const struct v4l2_ctrl_ops s5k6aa_ctrl_ops = { >>>> + .s_ctrl = s5k6aa_s_ctrl, >>>> +}; >>>> + >>>> +static int s5k6aa_log_status(struct v4l2_subdev *sd) >>>> +{ >>>> + v4l2_ctrl_handler_log_status(sd->ctrl_handler, sd->name); >>>> + return 0; >>>> +} >>>> + >>>> +static const struct v4l2_subdev_video_ops s5k6aa_video_ops = { >>>> + .g_frame_interval = s5k6aa_g_frame_interval, >>>> + .s_frame_interval = s5k6aa_s_frame_interval, >>>> + .s_stream = s5k6aa_s_stream, >>>> +}; >>>> + >>>> +/* >>>> + * V4L2 subdev internal operations >>>> + */ >>>> +static int s5k6aa_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) >>>> +{ >>>> + struct v4l2_mbus_framefmt *mf = v4l2_subdev_get_try_format(fh, 0); >>>> + >>>> + s5k6aa_get_preset_fmt(to_s5k6aa(sd)->preset, mf); >>>> + return 0; >>>> +} >>>> + >>>> +int s5k6aa_check_fw_revision(struct s5k6aa *s5k6aa) >>>> +{ >>>> + struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd); >>>> + u16 api_ver = 0, fw_rev = 0; >>>> + >>>> + int ret = s5k6aa_set_ahb_address(client); >>>> + >>>> + if (!ret) >>>> + ret = s5k6aa_read(client, REG_FW_APIVER,&api_ver); >>>> + if (!ret) >>>> + ret = s5k6aa_read(client, REG_FW_REVISION,&fw_rev); >>>> + if (ret) { >>>> + v4l2_err(&s5k6aa->sd, "FW revision check failed!\n"); >>>> + return ret; >>>> + } >>>> + >>>> + v4l2_info(&s5k6aa->sd, "FW API ver.: 0x%X, FW rev.: 0x%X\n", >>>> + api_ver, fw_rev); >>>> + >>>> + return api_ver == S5K6AAFX_FW_APIVER ? 0 : -ENODEV; >>>> +} >>>> + >>>> +static int s5k6aa_registered(struct v4l2_subdev *sd) >>>> +{ >>>> + struct s5k6aa *s5k6aa = to_s5k6aa(sd); >>>> + int ret; >>>> + >>>> + mutex_lock(&s5k6aa->lock); >>>> + ret = __s5k6aa_power_enable(s5k6aa); >>>> + if (!ret) { >>>> + msleep(100); >>>> + ret = s5k6aa_check_fw_revision(s5k6aa); >>>> + __s5k6aa_power_disable(s5k6aa); >>>> + } >>>> + mutex_unlock(&s5k6aa->lock); >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +static const struct v4l2_subdev_internal_ops s5k6aa_subdev_internal_ops = { >>>> + .registered = s5k6aa_registered, >>>> + .open = s5k6aa_open, >>>> +}; >>>> + >>>> +static const struct v4l2_subdev_core_ops s5k6aa_core_ops = { >>>> + .s_power = s5k6aa_set_power, >>>> + .g_ctrl = v4l2_subdev_g_ctrl, >>>> + .s_ctrl = v4l2_subdev_s_ctrl, >>>> + .queryctrl = v4l2_subdev_queryctrl, >>>> + .querymenu = v4l2_subdev_querymenu, >>>> + .g_ext_ctrls = v4l2_subdev_g_ext_ctrls, >>>> + .try_ext_ctrls = v4l2_subdev_try_ext_ctrls, >>>> + .s_ext_ctrls = v4l2_subdev_s_ext_ctrls, >>> >>> Don't add these control ops. They are only needed if this subdev driver is >>> used by bridge drivers that are not yet converted to the control framework. >>> That's not the case, so just remove these ops here. >> >> Great! thanks for the hint. I've just added this to the list of changes for v3. >> >>> >>>> + .log_status = s5k6aa_log_status, >> >> Do we plan to support this op directly on subdev nodes ? Or should it be only >> accessible through bridge drivers ? >> I was just wondering if we should add VIDIOC_LOG_STATUS to subdev_do_ioctl(). > > We should. Just one of those things that we didn't get around to. > Can you add it? Yeah, I could take care of it. I'll also check the Docbook, if we need any changes there. > > Regards, > > Hans Thanks, -- Sylwester Nawrocki Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-10-06 21:36 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-09-21 17:45 [PATCH v2 0/3] Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 1/2] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control Sylwester Nawrocki 2011-09-21 17:45 ` [PATCH v2 2/2] v4l: Add v4l2 subdev driver for S5K6AAFX sensor Sylwester Nawrocki 2011-09-22 22:02 ` Sakari Ailus 2011-09-23 10:12 ` Sylwester Nawrocki 2011-09-25 10:08 ` Sakari Ailus 2011-09-25 16:59 ` Sylwester Nawrocki 2011-09-27 20:55 ` Sakari Ailus 2011-09-27 20:58 ` Sakari Ailus 2011-09-28 7:50 ` Sylwester Nawrocki 2011-10-01 9:17 ` Sylwester Nawrocki 2011-10-02 7:20 ` Sakari Ailus 2011-10-03 8:33 ` Laurent Pinchart 2011-10-06 20:00 ` Sylwester Nawrocki 2011-10-06 21:36 ` Sakari Ailus 2011-09-26 13:21 ` Hans Verkuil 2011-09-26 21:49 ` Sylwester Nawrocki 2011-09-27 7:14 ` Hans Verkuil 2011-09-27 8:07 ` Sylwester Nawrocki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).