mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
media: i2c: imx219: Drop IMX219_VTS_* macros
[ Upstream commit5ebbdd7aab] The IMX219_VTS_* macros define default VTS values for the modes supported by the driver. They are used in a single place, and hinder readability compared to using the value directly as a decimal number. Drop them. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Stable-dep-of:2c4f1ba735("media: imx219: Fix maximum frame length in lines") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
bc24c30f40
commit
f2f85e5ff1
@@ -71,20 +71,10 @@
|
||||
|
||||
/* V_TIMING internal */
|
||||
#define IMX219_REG_VTS CCI_REG16(0x0160)
|
||||
#define IMX219_VTS_15FPS 0x0dc6
|
||||
#define IMX219_VTS_30FPS_1080P 0x06e3
|
||||
#define IMX219_VTS_30FPS_BINNED 0x06e3
|
||||
#define IMX219_VTS_30FPS_640x480 0x06e3
|
||||
#define IMX219_VTS_MAX 0xffff
|
||||
|
||||
#define IMX219_VBLANK_MIN 32
|
||||
|
||||
/*Frame Length Line*/
|
||||
#define IMX219_FLL_MIN 0x08a6
|
||||
#define IMX219_FLL_MAX 0xffff
|
||||
#define IMX219_FLL_STEP 1
|
||||
#define IMX219_FLL_DEFAULT 0x0c98
|
||||
|
||||
/* HBLANK control - read only */
|
||||
#define IMX219_PPL_DEFAULT 3448
|
||||
|
||||
@@ -381,7 +371,7 @@ static const struct imx219_mode supported_modes[] = {
|
||||
.width = 3280,
|
||||
.height = 2464
|
||||
},
|
||||
.vts_def = IMX219_VTS_15FPS,
|
||||
.vts_def = 3526,
|
||||
.reg_list = {
|
||||
.num_of_regs = ARRAY_SIZE(mode_3280x2464_regs),
|
||||
.regs = mode_3280x2464_regs,
|
||||
@@ -398,7 +388,7 @@ static const struct imx219_mode supported_modes[] = {
|
||||
.width = 1920,
|
||||
.height = 1080
|
||||
},
|
||||
.vts_def = IMX219_VTS_30FPS_1080P,
|
||||
.vts_def = 1763,
|
||||
.reg_list = {
|
||||
.num_of_regs = ARRAY_SIZE(mode_1920_1080_regs),
|
||||
.regs = mode_1920_1080_regs,
|
||||
@@ -415,7 +405,7 @@ static const struct imx219_mode supported_modes[] = {
|
||||
.width = 3280,
|
||||
.height = 2464
|
||||
},
|
||||
.vts_def = IMX219_VTS_30FPS_BINNED,
|
||||
.vts_def = 1763,
|
||||
.reg_list = {
|
||||
.num_of_regs = ARRAY_SIZE(mode_1640_1232_regs),
|
||||
.regs = mode_1640_1232_regs,
|
||||
@@ -432,7 +422,7 @@ static const struct imx219_mode supported_modes[] = {
|
||||
.width = 1280,
|
||||
.height = 960
|
||||
},
|
||||
.vts_def = IMX219_VTS_30FPS_640x480,
|
||||
.vts_def = 1763,
|
||||
.reg_list = {
|
||||
.num_of_regs = ARRAY_SIZE(mode_640_480_regs),
|
||||
.regs = mode_640_480_regs,
|
||||
|
||||
Reference in New Issue
Block a user