[PATCH 0/3] Add v4l2 subdev driver for S5K6AAFX sensor with embedded ISP

[PATCH 0/3] Add v4l2 subdev driver for S5K6AAFX sensor with embedded ISP

[Sylwester Nawrocki]

Hello,

The following 3 patches add the S5K6AAFX sensor with embedded ISP driver and
minor enhancement of v4l2 control API. This is not a complete work and I thought
I'd publish this to get some feedback as early as possible.

In particular this driver depends on planned R/G/B component gain controls. 

Sylwester Nawrocki (3):
  v4l: Extend V4L2_CID_COLORFX control with AQUA effect
  v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
  v4l: Add S5K6AA(FX) sensor driver

 Documentation/DocBook/media/v4l/controls.xml |   10 +-
 drivers/media/video/Kconfig                  |    6 +
 drivers/media/video/Makefile                 |    1 +
 drivers/media/video/s5k6aa.c                 | 1578 ++++++++++++++++++++++++++
 drivers/media/video/v4l2-ctrls.c             |    1 +
 include/linux/videodev2.h                    |    2 +
 include/media/s5k6aa.h                       |   51 +
 7 files changed, 1645 insertions(+), 4 deletions(-)
 create mode 100644 drivers/media/video/s5k6aa.c
 create mode 100644 include/media/s5k6aa.h


Regards,
--
Sylwester Nawrocki
Samsung Poland R&D Center

[PATCH 1/3] v4l: Extend V4L2_CID_COLORFX control with AQUA effect

[Sylwester Nawrocki]

Add V4L2_COLORFX_AQUA image effect in the V4L2_CID_COLORFX menu.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 Documentation/DocBook/media/v4l/controls.xml |    5 +++--
 include/linux/videodev2.h                    |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 8516401..f3c6457 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -294,8 +294,9 @@ minimum value disables backlight compensation.</entry>
 <constant>V4L2_COLORFX_SKETCH</constant> (5),
 <constant>V4L2_COLORFX_SKY_BLUE</constant> (6),
 <constant>V4L2_COLORFX_GRASS_GREEN</constant> (7),
-<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8) and
-<constant>V4L2_COLORFX_VIVID</constant> (9).</entry>
+<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8),
+<constant>V4L2_COLORFX_VIVID</constant> (9) and
+<constant>V4L2_COLORFX_AQUA</constant> (10).</entry>
 	  </row>
 	  <row>
 	    <entry><constant>V4L2_CID_ROTATE</constant></entry>
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index fca24cc..5032226 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1144,6 +1144,7 @@ enum v4l2_colorfx {
 	V4L2_COLORFX_GRASS_GREEN = 7,
 	V4L2_COLORFX_SKIN_WHITEN = 8,
 	V4L2_COLORFX_VIVID = 9,
+	V4L2_COLORFX_AQUA = 10,
 };
 #define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
 #define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-- 
1.7.6

[PATCH 2/3] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control

[Sylwester 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 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>
---
 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 f3c6457..aff7989 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 5032226..ec858e7 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

[PATCH 3/3] v4l: Add v4l2 sub-device driver for S5K6AAFX sensor

[Sylwester Nawrocki]

This driver support only preview mode and currently uses one predefined
user register configuration set, out of 5 preview and 5 capture profiles.

V4L2_CID_RED/BLUE_BALANCE ids are used instead of new V4L2_CID_*_GAIN IDs.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/media/video/Kconfig  |    6 +
 drivers/media/video/Makefile |    1 +
 drivers/media/video/s5k6aa.c | 1578 ++++++++++++++++++++++++++++++++++++++++++
 include/media/s5k6aa.h       |   51 ++
 4 files changed, 1636 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 75bb46f..a512aaf 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -761,6 +761,12 @@ config VIDEO_NOON010PC30
 
 source "drivers/media/video/m5mols/Kconfig"
 
+config VIDEO_S5K6AA
+	tristate "S5K6AA(FX) 1.3M camera sensor support"
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	---help---
+	  Driver for Samsung S5K6AA(FX) 1.3M camera
+
 config VIDEO_OMAP3
 	tristate "OMAP 3 Camera support (EXPERIMENTAL)"
 	select OMAP_IOMMU
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 2723900..b84b10b 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -71,6 +71,7 @@ obj-$(CONFIG_VIDEO_SR030PC30)	+= sr030pc30.o
 obj-$(CONFIG_VIDEO_NOON010PC30)	+= noon010pc30.o
 obj-$(CONFIG_VIDEO_M5MOLS)	+= m5mols/
 obj-$(CONFIG_VIDEO_ADP1653)	+= adp1653.o
+obj-$(CONFIG_VIDEO_S5K6AA)	+= s5k6aa.o
 
 obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o
diff --git a/drivers/media/video/s5k6aa.c b/drivers/media/video/s5k6aa.c
new file mode 100644
index 0000000..fbba1b7
--- /dev/null
+++ b/drivers/media/video/s5k6aa.c
@@ -0,0 +1,1578 @@
+/*
+ * V4L2 driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor
+ * SoC with an Embedded Image Processor
+ *
+ * Copyright (C) 2011, Samsung Electronics Co., Ltd.
+ * Author: Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * Based on a driver authored by Dongsoo Nathaniel Kim.
+ *
+ * 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:
+ *   - replace V4L2_CID_*_BALANCE controls with new R/G/B gain controls
+ *   - set/get_crop operations
+ *   - proper colorspace handling
+ *   - more controls
+ * Possible improvements:
+ *   - add snapshot (device capture) mode support
+ *   - use REG_USER_* registers instead of some REG_P_*
+ *   - eliminate set_power callback from the platform_data struct
+ */
+
+#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_USER_GLAMOUR		0x01ec
+#define REG_G_SPEC_EFFECTS		0x01ee
+#define REG_G_ENABLE_PREV		0x01f0
+#define REG_G_ENABLE_PREV_CHG		0x01f2
+#define REG_G_ENABLE_CAPT		0x01f4
+#define REG_G_ENABLE_CAPT_CHG		0x01f6
+#define REG_G_NEW_CFG_SYNC		0x01f8
+
+#define REG_G_PREV_IN_WIDTH		0x01fa
+#define REG_G_PREV_IN_HEIGHT		0x01fc
+#define REG_G_PREV_IN_XOFFS		0x01fe
+#define REG_G_PREV_IN_YOFFS		0x0200
+#define REG_G_CAPT_IN_WIDTH		0x0202
+#define REG_G_CAPT_IN_HEIGHT		0x0204
+#define REG_G_CAPT_IN_XOFFS		0x0206
+#define REG_G_CAPT_IN_YOFFS		0x0208
+#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
+#define REG_G_ACTIVE_CAPT_CFG		0x0224
+#define REG_G_CAPT_CFG_CHG		0x0226
+#define REG_G_CAPT_CFG_ERROR		0x0228
+
+#define REG_SLEEP_MODE			0x022e
+#define REG_SLEEP_MODE_CHG		0x0230
+
+/* 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_SATURATION(n)		PREG(n, 0x0258)
+#define REG_P_SHARPBLUR(n)		PREG(n, 0x025a)
+#define REG_P_GLAMOUR(n)		PREG(n, 0x025c)
+#define REG_P_COLORTEMP(n)		PREG(n, 0x025e)
+#define REG_P_DEVGAMMAINDEX(n)		PREG(n, 0x0260)
+#define REG_P_PREV_MIRROR(n)		PREG(n, 0x0262)
+#define REG_P_CAPT_MIRROR(n)		PREG(n, 0x0264)
+
+/* Extended image property controls */
+#define REG_SF_USR_LEI_L		0x03c0
+#define REG_SF_USR_LEI_H		0x03c2
+#define REG_SF_USR_LEI_CHG		0x03c4
+/* 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_RGAIN			0x03d0
+#define REG_SF_RGAIN_CHG		0x03d2
+#define REG_SF_GGAIN			0x03d4
+#define REG_SF_GGAIN_CHG		0x03d6
+#define REG_SF_BGAIN			0x03d8
+#define REG_SF_BGAIN_CHG		0x03da
+#define REG_SF_FLICKER_QUANT		0x03dc
+#define REG_SF_FLICKER_QUANT_CHG	0x03de
+
+#define REG_SF_ANALOG_GAIN		0x03f2
+#define REG_SF_ANALOG_CHG		0x03f4
+#define REG_SF_DIG_GAIN			0x03f6
+#define REG_SF_DIG_CHG			0x04f8
+
+/* 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;
+	/* Auto / manual white balance cluster */
+	struct v4l2_ctrl *awb;
+	struct v4l2_ctrl *gain_red;
+	struct v4l2_ctrl *gain_blue;
+	struct v4l2_ctrl *gain_green;
+	/* 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 skipping: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_VYUY8_2X8,	V4L2_COLORSPACE_JPEG,	5 },
+	{ V4L2_MBUS_FMT_RGB565_2X8_BE,	V4L2_COLORSPACE_JPEG,	0 },
+	/* TODO: revisit the colorspace (range is 16-240) */
+	{ V4L2_MBUS_FMT_YUYV8_2X8,	V4L2_COLORSPACE_REC709,	6 },
+};
+
+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;
+}
+
+/* Write the command register. Assume 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);
+}
+
+/* Read the command register. Assume 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_bulk_write(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);
+}
+
+static int s5k6aa_preview_cfg_status(struct i2c_client *client)
+{
+	u16 error = 0;
+
+	/* Null 'error' means the configuration is applied successfully */
+	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 ? -EINVAL : 0);
+}
+
+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);
+}
+
+/**
+ * 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 value)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+	struct s5k6aa_preset *preset = s5k6aa->preset;
+
+	u32 hflip = value ^ preset->inv_hflip;
+	u32 vflip = s5k6aa->ctrls.vflip->val ^ preset->inv_vflip;
+
+	return s5k6aa_write(client, REG_P_PREV_MIRROR(preset->index),
+			    hflip | (vflip << 1));
+}
+
+/* Configure auto/manual white balance and R/G/B gains */
+static int s5k6aa_set_awb(struct s5k6aa *s5k6aa, int awb)
+{
+	struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+	struct s5k6aa_ctrls *ctrls = &s5k6aa->ctrls;
+	u16 reg;
+
+	int ret = s5k6aa_read(c, REG_DBG_AUTOALG_EN, &reg);
+
+	if (!ret && !awb) {
+		ret = s5k6aa_write(c, REG_SF_RGAIN, ctrls->gain_red->val);
+		if (!ret)
+			ret = s5k6aa_write(c, REG_SF_RGAIN_CHG, 1);
+		if (ret)
+			return ret;
+#if 0
+		ret = s5k6aa_write(c, REG_SF_GGAIN, ctrls->gain_green->val);
+		if (!ret)
+			ret = s5k6aa_write(c, REG_SF_GGAIN_CHG, 1);
+		if (ret)
+			return ret;
+#endif
+		ret = s5k6aa_write(c, REG_SF_BGAIN, ctrls->gain_blue->val);
+		if (!ret)
+			ret = s5k6aa_write(c, REG_SF_BGAIN_CHG, 1);
+	}
+	if (!ret) {
+		reg = awb ? reg | AALG_WB_EN_MASK : reg & ~AALG_WB_EN_MASK;
+		ret = s5k6aa_write(c, REG_DBG_AUTOALG_EN, reg);
+	}
+
+	return ret;
+}
+
+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);
+	}
+	if (ret)
+		return ret;
+	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_AQUA,	 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_set_output_framefmt(struct s5k6aa *s5k6aa,
+				      struct s5k6aa_preset *p, bool apply)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+	int ret;
+
+	if (WARN_ON(p->pixfmt == NULL))
+		return -EINVAL;
+
+	ret = s5k6aa_write(client, REG_P_OUT_WIDTH(p->index),
+			   p->out_size.width);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_OUT_HEIGHT(p->index),
+				   p->out_size.height);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_FMT(p->index),
+				   p->pixfmt->reg_p_fmt);
+	if (!ret && apply) {
+		ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1);
+		if (!ret)
+			ret = s5k6aa_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)
+{
+	/* TODO: read and check REG_G_NEW_CFG_SYNC with timeout */
+	int ret = s5k6aa_write(client, REG_G_PREV_CFG_CHG, 1);
+	return ret ? ret : s5k6aa_write(client, REG_G_NEW_CFG_SYNC, 1);
+}
+
+/**
+ * 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 *p)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(&s5k6aa->sd);
+	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, p, false);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_MAX_OUT_RATE(p->index),
+				   S5K6AA_MAX_PCLK_FREQ);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_MIN_OUT_RATE(p->index),
+				   S5K6AA_MIN_PCLK_FREQ);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_FR_RATE_TYPE(p->index),
+				   p->frame_rate_type);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_FR_RATE_Q_TYPE(p->index),
+				   frame_rate_q);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_MAX_FR_TIME(p->index),
+				   s5k6aa->fiv->reg_fr_time + 15);
+	if (!ret)
+		ret = s5k6aa_write(client, REG_P_MIN_FR_TIME(p->index),
+				   s5k6aa->fiv->reg_fr_time - 15);
+	if (!ret)
+		s5k6aa_sync_preview_preset(client, 0);
+
+	if (!ret) {
+		ret = s5k6aa_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_bulk_write(sd, s5k6aa_analog_config);
+	if (ret)
+		return ret;
+	msleep(100);
+
+	return s5k6aa_configure_pixel_clock(s5k6aa);
+}
+
+/*
+ * 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);
+	s5k6aa->power += on ? 1 : -1;
+
+	if (WARN_ON(s5k6aa->power < 0) || !on != !s5k6aa->power)
+		goto done;
+
+	if (on) {
+		ret = __s5k6aa_power_enable(s5k6aa);
+		if (!ret)
+			ret = s5k6aa_initialize_isp(sd);
+	} else {
+		ret = __s5k6aa_power_disable(s5k6aa);
+	}
+ done:
+	mutex_unlock(&s5k6aa->lock);
+	if (ret || !on)
+		return ret;
+
+	return v4l2_ctrl_handler_setup(&s5k6aa->ctrls.handler);
+}
+
+static int __s5k6aa_stream(struct s5k6aa *s5k6aa, int enable)
+{
+	struct i2c_client *c = v4l2_get_subdevdata(&s5k6aa->sd);
+	int ret;
+
+	ret = s5k6aa_write(c, REG_G_ENABLE_PREV, !!enable);
+	if (!ret)
+		ret = s5k6aa_write(c, REG_G_ENABLE_PREV_CHG, 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;
+}
+
+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));
+	mutex_lock(&s5k6aa->lock);
+
+	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);
+
+	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;
+}
+
+/*
+ * V4L2 subdev operations
+ */
+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_WIDTH_MAX;
+
+	return 0;
+}
+
+static const struct s5k6aa_pixfmt *
+s5k6aa_try_format(struct s5k6aa *s5k6aa, struct v4l2_mbus_framefmt *mf)
+{
+	int i = ARRAY_SIZE(s5k6aa_formats);
+
+	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);
+	while (--i)
+		if (mf->code == s5k6aa_formats[i].code)
+			break;
+
+	mf->colorspace	= s5k6aa_formats[i].colorspace;
+	mf->code	= s5k6aa_formats[i].code;
+
+	return &s5k6aa_formats[i];
+}
+
+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_AUTO_WHITE_BALANCE:
+		err = s5k6aa_set_awb(s5k6aa, ctrl->val);
+		break;
+
+	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_P_SATURATION(pid), ctrl->val);
+		break;
+
+	case V4L2_CID_SHARPNESS:
+		err = s5k6aa_write(c, REG_P_SHARPBLUR(pid), ctrl->val);
+		break;
+
+	case V4L2_CID_WHITE_BALANCE_TEMPERATURE:
+		err = s5k6aa_write(c, REG_P_COLORTEMP(pid), ctrl->val);
+		break;
+
+	default:
+		v4l2_err(sd, "Unsupported control id: %d\n", ctrl->id);
+		err = -EINVAL;
+	}
+	/* 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)
+{
+	struct s5k6aa_ctrls *ctrls = &to_s5k6aa(sd)->ctrls;
+
+	v4l2_ctrl_handler_log_status(&ctrls->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,
+	/* FIXME: there is no way to use this op on standalone subdevs */
+	.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,
+};
+
+#define s5k6aa_new_ctrl(__t, priv, args...) \
+	v4l2_ctrl_new_##__t(&(priv)->ctrls.handler, &s5k6aa_ctrl_ops, ##args)
+
+static int s5k6aa_initialize_ctrls(struct s5k6aa *s5k6aa)
+{
+	int ret;
+
+	ret = v4l2_ctrl_handler_init(&s5k6aa->ctrls.handler, 17);
+	if (ret)
+		return ret;
+	/* Auto white balance cluster */
+	s5k6aa->ctrls.awb = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
+	s5k6aa->ctrls.gain_red = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_RED_BALANCE, 0, 256, 1, 127);
+	s5k6aa->ctrls.gain_blue = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_BLUE_BALANCE, 0, 256, 1, 127);
+	/* s5k6aa->ctrls.gain_green = s5k6aa_new_ctrl(std, s5k6aa, */
+	/* 			V4L2_CID_GREEN1_GAIN, 0, 256, 1, 127); */
+	v4l2_ctrl_auto_cluster(3, &s5k6aa->ctrls.awb, 0, false);
+
+	s5k6aa->ctrls.hflip = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_HFLIP, 0, 1, 1, 0);
+	s5k6aa->ctrls.vflip = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_VFLIP, 0, 1, 1, 0);
+	v4l2_ctrl_cluster(2, &s5k6aa->ctrls.hflip);
+
+	s5k6aa->ctrls.auto_exp = s5k6aa_new_ctrl(std_menu, s5k6aa,
+				V4L2_CID_EXPOSURE_AUTO,
+				V4L2_EXPOSURE_MANUAL, 0, V4L2_EXPOSURE_AUTO);
+	/* Exposure time: x 1 us */
+	s5k6aa->ctrls.exposure = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_EXPOSURE, 0, 6000000U, 1, 100000U);
+	/* Total gain: 256 <=> 1 x */
+	s5k6aa->ctrls.gain = s5k6aa_new_ctrl(std, s5k6aa,
+				V4L2_CID_GAIN, 0, 256, 1, 256);
+	v4l2_ctrl_auto_cluster(3, &s5k6aa->ctrls.auto_exp, 0, false);
+
+	s5k6aa_new_ctrl(std_menu, s5k6aa, V4L2_CID_POWER_LINE_FREQUENCY,
+		       V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0,
+		       V4L2_CID_POWER_LINE_FREQUENCY_AUTO);
+
+	s5k6aa_new_ctrl(std_menu, s5k6aa, V4L2_CID_COLORFX,
+			V4L2_COLORFX_SKETCH, 0x3D0, V4L2_COLORFX_NONE);
+
+	/* TODO: normalize to standard value range */
+	s5k6aa_new_ctrl(std, s5k6aa, V4L2_CID_WHITE_BALANCE_TEMPERATURE,
+			0, 256, 1, 0);
+	s5k6aa_new_ctrl(std, s5k6aa, V4L2_CID_SATURATION, 0, 256, 1, 0);
+	s5k6aa_new_ctrl(std, s5k6aa, V4L2_CID_SHARPNESS, 0, 256, 1, 0);
+
+	/* TODO: */
+	s5k6aa_new_ctrl(std, s5k6aa, V4L2_CID_BRIGHTNESS, -127, 127, 1, 10);
+
+	s5k6aa->sd.ctrl_handler = &s5k6aa->ctrls.handler;
+
+	if (s5k6aa->ctrls.handler.error)
+		v4l2_ctrl_handler_free(&s5k6aa->ctrls.handler);
+
+	return s5k6aa->ctrls.handler.error;
+}
+
+/*
+ * 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(&s5k6aa->ctrls.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..b3b0f81
--- /dev/null
+++ b/include/media/s5k6aa.h
@@ -0,0 +1,51 @@
+/*
+ * Driver header for S5K6AAFX camera sensor
+ *
+ * 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 nRESET pin
+ * @gpio_nstby:  GPIO driving nSTBY 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

Re: [PATCH 2/3] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control

[Laurent Pinchart]

Hi Sylwester,

Thanks for the patch.

On Friday 16 September 2011 19:05:29 Sylwester Nawrocki wrote:
> 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 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 f3c6457..aff7989
> 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 5032226..ec858e7 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)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/3] v4l: Extend V4L2_CID_COLORFX control with AQUA effect

[Laurent Pinchart]

Hi Sylwester,

Thanks for the patch.

On Friday 16 September 2011 19:05:28 Sylwester Nawrocki wrote:
> Add V4L2_COLORFX_AQUA image effect in the V4L2_CID_COLORFX menu.

What's the aqua effect ?

> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  Documentation/DocBook/media/v4l/controls.xml |    5 +++--
>  include/linux/videodev2.h                    |    1 +
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/DocBook/media/v4l/controls.xml
> b/Documentation/DocBook/media/v4l/controls.xml index 8516401..f3c6457
> 100644
> --- a/Documentation/DocBook/media/v4l/controls.xml
> +++ b/Documentation/DocBook/media/v4l/controls.xml
> @@ -294,8 +294,9 @@ minimum value disables backlight compensation.</entry>
>  <constant>V4L2_COLORFX_SKETCH</constant> (5),
>  <constant>V4L2_COLORFX_SKY_BLUE</constant> (6),
>  <constant>V4L2_COLORFX_GRASS_GREEN</constant> (7),
> -<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8) and
> -<constant>V4L2_COLORFX_VIVID</constant> (9).</entry>
> +<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8),
> +<constant>V4L2_COLORFX_VIVID</constant> (9) and
> +<constant>V4L2_COLORFX_AQUA</constant> (10).</entry>
>  	  </row>
>  	  <row>
>  	    <entry><constant>V4L2_CID_ROTATE</constant></entry>
> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
> index fca24cc..5032226 100644
> --- a/include/linux/videodev2.h
> +++ b/include/linux/videodev2.h
> @@ -1144,6 +1144,7 @@ enum v4l2_colorfx {
>  	V4L2_COLORFX_GRASS_GREEN = 7,
>  	V4L2_COLORFX_SKIN_WHITEN = 8,
>  	V4L2_COLORFX_VIVID = 9,
> +	V4L2_COLORFX_AQUA = 10,
>  };
>  #define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
>  #define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/3] v4l: Extend V4L2_CID_COLORFX control with AQUA effect

[Subash Patel]

Hi Laurent,

I am not representing Sylwester :), But with a similar sensor I use, 
Aqua means cool tone which is Cb/Cr manipulations.

Regards,
Subash

On 09/19/2011 04:38 AM, Laurent Pinchart wrote:
> Hi Sylwester,
>
> Thanks for the patch.
>
> On Friday 16 September 2011 19:05:28 Sylwester Nawrocki wrote:
>> Add V4L2_COLORFX_AQUA image effect in the V4L2_CID_COLORFX menu.
>
> What's the aqua effect ?
>
>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
>> ---
>>   Documentation/DocBook/media/v4l/controls.xml |    5 +++--
>>   include/linux/videodev2.h                    |    1 +
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/DocBook/media/v4l/controls.xml
>> b/Documentation/DocBook/media/v4l/controls.xml index 8516401..f3c6457
>> 100644
>> --- a/Documentation/DocBook/media/v4l/controls.xml
>> +++ b/Documentation/DocBook/media/v4l/controls.xml
>> @@ -294,8 +294,9 @@ minimum value disables backlight compensation.</entry>
>>   <constant>V4L2_COLORFX_SKETCH</constant>  (5),
>>   <constant>V4L2_COLORFX_SKY_BLUE</constant>  (6),
>>   <constant>V4L2_COLORFX_GRASS_GREEN</constant>  (7),
>> -<constant>V4L2_COLORFX_SKIN_WHITEN</constant>  (8) and
>> -<constant>V4L2_COLORFX_VIVID</constant>  (9).</entry>
>> +<constant>V4L2_COLORFX_SKIN_WHITEN</constant>  (8),
>> +<constant>V4L2_COLORFX_VIVID</constant>  (9) and
>> +<constant>V4L2_COLORFX_AQUA</constant>  (10).</entry>
>>   	</row>
>>   	<row>
>>   	<entry><constant>V4L2_CID_ROTATE</constant></entry>
>> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
>> index fca24cc..5032226 100644
>> --- a/include/linux/videodev2.h
>> +++ b/include/linux/videodev2.h
>> @@ -1144,6 +1144,7 @@ enum v4l2_colorfx {
>>   	V4L2_COLORFX_GRASS_GREEN = 7,
>>   	V4L2_COLORFX_SKIN_WHITEN = 8,
>>   	V4L2_COLORFX_VIVID = 9,
>> +	V4L2_COLORFX_AQUA = 10,
>>   };
>>   #define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
>>   #define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
>

Re: [PATCH 1/3] v4l: Extend V4L2_CID_COLORFX control with AQUA effect

[Laurent Pinchart]

Hi Sylwester,

On Monday 19 September 2011 13:26:39 Sylwester Nawrocki wrote:
> On 09/19/2011 08:08 AM, Subash Patel wrote:
> > Hi Laurent,
> > 
> > I am not representing Sylwester :), But with a similar sensor I use, Aqua
> > means cool tone which is Cb/Cr manipulations.
> > 
> > On 09/19/2011 04:38 AM, Laurent Pinchart wrote:
> >> On Friday 16 September 2011 19:05:28 Sylwester Nawrocki wrote:
> >>> Add V4L2_COLORFX_AQUA image effect in the V4L2_CID_COLORFX menu.
> >> 
> >> What's the aqua effect ?
> 
> Aqua means cool tone, as Subash explained. It's somehow opposite to Sepia
> which is warm tone. I'll improve the commit description in the next patch
> version.
> I tried to make a table with short description of each color effect in the
> DocBook but it was taking me too long so I dropped it for a moment.
> 
> I have attached an image presenting the color effects. Maybe it's worth
> to add something like this to the DocBook, or perhaps just the
> descriptions.

Thanks for the information. I think it would indeed be useful to add 
descriptions to the documentation.

> >>> Signed-off-by: Sylwester Nawrocki<s.nawrocki@samsung.com>
> >>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> >>> ---
> >>> 
> >>>   Documentation/DocBook/media/v4l/controls.xml |    5 +++--
> >>>   include/linux/videodev2.h                    |    1 +
> >>>   2 files changed, 4 insertions(+), 2 deletions(-)
> >>> 
> >>> diff --git a/Documentation/DocBook/media/v4l/controls.xml
> >>> b/Documentation/DocBook/media/v4l/controls.xml index 8516401..f3c6457
> >>> 100644
> >>> --- a/Documentation/DocBook/media/v4l/controls.xml
> >>> +++ b/Documentation/DocBook/media/v4l/controls.xml
> >>> @@ -294,8 +294,9 @@ minimum value disables backlight
> >>> compensation.</entry>
> >>> 
> >>>   <constant>V4L2_COLORFX_SKETCH</constant>  (5),
> >>>   <constant>V4L2_COLORFX_SKY_BLUE</constant>  (6),
> >>>   <constant>V4L2_COLORFX_GRASS_GREEN</constant>  (7),
> >>> 
> >>> -<constant>V4L2_COLORFX_SKIN_WHITEN</constant>  (8) and
> >>> -<constant>V4L2_COLORFX_VIVID</constant>  (9).</entry>
> >>> +<constant>V4L2_COLORFX_SKIN_WHITEN</constant>  (8),
> >>> +<constant>V4L2_COLORFX_VIVID</constant>  (9) and
> >>> +<constant>V4L2_COLORFX_AQUA</constant>  (10).</entry>
> >>> 
> >>>       </row>
> >>>       <row>
> >>>       <entry><constant>V4L2_CID_ROTATE</constant></entry>
> >>> 
> >>> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
> >>> index fca24cc..5032226 100644
> >>> --- a/include/linux/videodev2.h
> >>> +++ b/include/linux/videodev2.h
> >>> @@ -1144,6 +1144,7 @@ enum v4l2_colorfx {
> >>> 
> >>>       V4L2_COLORFX_GRASS_GREEN = 7,
> >>>       V4L2_COLORFX_SKIN_WHITEN = 8,
> >>>       V4L2_COLORFX_VIVID = 9,
> >>> 
> >>> +    V4L2_COLORFX_AQUA = 10,
> >>> 
> >>>   };
> >>>   #define V4L2_CID_AUTOBRIGHTNESS            (V4L2_CID_BASE+32)
> >>>   #define V4L2_CID_BAND_STOP_FILTER        (V4L2_CID_BASE+33)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/3] v4l: Extend V4L2_CID_COLORFX control with AQUA effect

[Sylwester Nawrocki]

Hi Laurent,

On 09/21/2011 12:23 AM, Laurent Pinchart wrote:
> On Monday 19 September 2011 13:26:39 Sylwester Nawrocki wrote:
>> On 09/19/2011 08:08 AM, Subash Patel wrote:
>>> Hi Laurent,
>>>
>>> I am not representing Sylwester :), But with a similar sensor I use, Aqua
>>> means cool tone which is Cb/Cr manipulations.
>>>
>>> On 09/19/2011 04:38 AM, Laurent Pinchart wrote:
>>>> On Friday 16 September 2011 19:05:28 Sylwester Nawrocki wrote:
>>>>> Add V4L2_COLORFX_AQUA image effect in the V4L2_CID_COLORFX menu.
>>>>
>>>> What's the aqua effect ?
>>
>> Aqua means cool tone, as Subash explained. It's somehow opposite to Sepia
>> which is warm tone. I'll improve the commit description in the next patch
>> version.
>> I tried to make a table with short description of each color effect in the
>> DocBook but it was taking me too long so I dropped it for a moment.
>>
>> I have attached an image presenting the color effects. Maybe it's worth
>> to add something like this to the DocBook, or perhaps just the
>> descriptions.
> 
> Thanks for the information. I think it would indeed be useful to add 
> descriptions to the documentation.

Sure, I'll try to find some time to complete this. And I wonder, what BLUE_SKY
effect is ? I suspect it's very much same as the Aqua effect which is present
in our sensor ISP. Does anyone know exactly ? Perhaps I could just use it
instead of adding new menu entry.

Regards,
-- 
Sylwester Nawrocki
Samsung Poland R&D Center