Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F152B1B6D08 for ; Wed, 5 Aug 2026 00:37:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785890278; cv=none; b=ukEyLWvHmOOkHVBaaw6SjK5YLfiwj2Jm63oF6Qu0KLGakwD+7JLQVw7Gr3iil/EwyX90eh2XvmWtgbY31i5+KX/GbHPEUzdDs03Xq4NzhqpyBCokIqce17nJPUPezFDUNqnKcqsGKU/4ept50tIxFw2o+cKubuQeig1D0RsLePI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785890278; c=relaxed/simple; bh=XOWT+6dBtTrhpUgahKDSI5Mo+UNDy+lx3gSIqG2Nmi4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZUbWnUTsOt6Fk8T5XLMlg8XHIW7wM/U1XsVkMl7lFLVLVOYFWiCbpFWkSv2aeA1RcvJz5peiAi2CbDjPLx9dN07+aXwEOnbi2XtzTzJ39Lv27IMJJNjxIh4DcRpjVonYoTowqeNfajaSsvaVMtDDtlTazeTUe94mofJDIrGhV+M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J511EWV9; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J511EWV9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A551F000E9; Wed, 5 Aug 2026 00:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785890276; bh=vjKaQ082Jg7613hJSiBT82wcyt3R0FflZ3SLkrBPQA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J511EWV9wfdB8no7fMKToZrff5kzHEtFjak8rtgRvvUWtomGfWDzibfy0oMetTUwc EVB89UOGtDPIWLiOHPSa4Uz+W+jT8T3SfsE+HIdtnfL6FUXEsqG4RM9vS2gfI7g9hx 9KDOYuorSCTlfWfNe5NSwaB3lJPbPESeoCwchseSh3mg7uRsW6f0g36/KFUg9brYOw 4d81M20IG7HhAz7QQRNyp0Zw1GxUOFzrweL9J1UijQwfOCz0pd4OsVK/WUxyFt5FM8 hw5y5uSOTI1rOvzpSPzwBtlyUOLd1ZlBGTrw14H4754YYm/k4XBsXrW4hnglq2NCeN J2UGxx5aSaPoQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Laurent Pinchart , Dave Stevenson , Jacopo Mondi , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 5.15.y 1/4] media: i2c: imx219: Drop IMX219_VTS_* macros Date: Tue, 4 Aug 2026 20:37:51 -0400 Message-ID: <20260805003754.3975160-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072956-strum-murmuring-51d3@gregkh> References: <2026072956-strum-murmuring-51d3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Laurent Pinchart [ Upstream commit 5ebbdd7aab3321e60a8be23aac1fee4f16644021 ] 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 Reviewed-by: Dave Stevenson Reviewed-by: Jacopo Mondi Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines") Signed-off-by: Sasha Levin --- drivers/media/i2c/imx219.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 389f61a5b5958..3744b936dcd6e 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -49,20 +49,10 @@ /* V_TIMING internal */ #define IMX219_REG_VTS 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_FLL_MAX 0xffff #define IMX219_VBLANK_MIN 4 -/*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 @@ -386,7 +376,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, @@ -403,7 +393,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, @@ -420,7 +410,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, @@ -437,7 +427,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, @@ -841,7 +831,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, imx219->mode = mode; /* Update limits and set FPS to default */ __v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN, - IMX219_VTS_MAX - mode->height, 1, + IMX219_FLL_MAX - mode->height, 1, mode->vts_def - mode->height); __v4l2_ctrl_s_ctrl(imx219->vblank, mode->vts_def - mode->height); @@ -1261,7 +1251,7 @@ static int imx219_init_controls(struct imx219 *imx219) /* Initial vblank/hblank/exposure parameters based on current mode */ imx219->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops, V4L2_CID_VBLANK, IMX219_VBLANK_MIN, - IMX219_VTS_MAX - height, 1, + IMX219_FLL_MAX - height, 1, imx219->mode->vts_def - height); hblank = IMX219_PPL_DEFAULT - imx219->mode->width; imx219->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops, -- 2.53.0