From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6557CD37B5 for ; Mon, 11 May 2026 09:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8Rqdip9xlvYYx7a6Z4ny2q52ApONvt288APGOybH+GI=; b=17nHbuJA3eJkZP8IcZaC3S0n7X 8+OV5JfA5LnKtShp9vmfYI+4icK4DVV4odeSupWmMyMdhWmXU3vJ+F37fihSY4AuyTslqusCSqB4u /oKbQt7R4EvBCv5CZqKX3xj4s9SZI+ww+XboXfYlvVveu97z/9z5o3soYVeAfwaN4agrvG2ujV2xb /zlyn7x9w9jbtm/+J/jtFLHzdEOlgcfmq3VyMCalMREN65akjnCOZai6G4e9quol5GyV1Yp7zJ75e rGfXSR6JKJNgITRBkc3lpt0mDdcPwnn+GOo5u73CfTI8paz6HuZlYPUEJe0ZbyN6yKp+Hr0oJlfWI AXY6W7sg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wMMfu-0000000CrBU-3AC1; Mon, 11 May 2026 09:11:42 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wMMfq-0000000Cr97-1gdt for linux-arm-kernel@lists.infradead.org; Mon, 11 May 2026 09:11:39 +0000 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-82f8b60e485so1818897b3a.0 for ; Mon, 11 May 2026 02:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778490698; x=1779095498; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8Rqdip9xlvYYx7a6Z4ny2q52ApONvt288APGOybH+GI=; b=Jh6nftYhbdKzt5DX2yQ575iBMmG3MFqhaAZwbQvnnKI1uPLgkAI++O5mJy52uYaKIi dXqsoJ1p86xAT7uKmawAx4R6MwwVECW68tEBWrIHiAEKiqPVThXRrashi+1SBJL7D/OW Z8VO9snbqYWZzJ+MACbtwJhpqyDJVIeBPxl9AT0UdaSMvnK1MEl1qHaFtwrzPAZpRL+L OBatlNMB6al5E80830iz+v8RDEvUy+grzDoPNC5dQdXxCqzkN/rmDWTrjs6l1lcT3p9q l2tzk24T9SXoaTZmhSd+M4fvkeZu0vLcEs2/vm0DVMXr7RMcOpXVQnalgWGTZysfc8Ix hGYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778490698; x=1779095498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8Rqdip9xlvYYx7a6Z4ny2q52ApONvt288APGOybH+GI=; b=M8YWPWCeE8kVFvNM/YMok+S5iSNNl3QN7+IUvxlVTkuegfE4tVTkK6QsKEf4Wr3a9H A4T9viD3srL2gtvCSToriKIbx0bfDDqdjNWLeRnVrWFHqvuHNG+EzJ2zyR5JURdnDQLK pQgdfWE57KVHoMdSX9bYsT5SljTFo+OCfV3Do4Aei0qToleyVDX0D7UvPax0vAjPUdrH vEhccvAEcz6UYBetkrVH6RC6s2t2egvLI53VCuv/mCxsrdT7TFXDmbjxlc+dTXrteckm /kDAk27oGWdmxWMUOYrURANnccEgBjiIlGeW2nHFh64LlV42voqWodJxGNIkZ8AIqFcL VvIA== X-Forwarded-Encrypted: i=1; AFNElJ8sGEFWwH+fkR02ZxD8CSumJpyqUglyx5MRG1OlOvrWH85k6cWogGVJcLl2Q1VXAXmL0dfdLafz3oeJ0D1afIa0@lists.infradead.org X-Gm-Message-State: AOJu0YyeIvQtUOFOT1IN8zRLNQZECnoOgEosZ7y2/Sq9PcXqTuddR5KN d9uS1GKeA3kjeZSOZ0idvI2v+a/M42B34psdCXbz1/A2chpC1A7LYbW2 X-Gm-Gg: Acq92OF6PEzcDeNNHh1g4XVgRgsnIgF0o4ul5AjqpJ+J/9oviEyIXFtjOyZ0gUFDV2s 3Uo0osgzDerjCDb4+oF8m8/w9LCD4kDeGcVlIKiMuqCTjpSXFuTBdByFMgwH143VnGMpj/VkJUz N8uNluqYgG/6YvW+NN2X3MML/O7wBGDgL3pm6Y0mLOFa0Kazy7ewdgt43xphdenH9ZZuAwh7ynE Zrvredc4K66LjlNrc+wwiSFv2RAzdFCP7JCbncYaw7pbToaeVrEtXN6VlWEN1k7jXl4Urjin8R6 urQm0SbAG6SiTWbrBcC2jRAj9/eIIg1rzqc7zZc8BcUg1SVg+5++wHXYg0h/uh8LVqEeOTF00ut hFrtVEAJFQykJjBR9J/suor1A+FZR+qdCykluM62srSSyHSDta9c29J0LhcNxQJX6DEXtIYDAfR U5jS/bP50uxQ/EIZgA8vWyGBGwp2Y5a1M3+g== X-Received: by 2002:a05:6a00:1acb:b0:82f:37e3:ae6e with SMTP id d2e1a72fcca58-83cf6a3a8a2mr13196594b3a.31.1778490697664; Mon, 11 May 2026 02:11:37 -0700 (PDT) Received: from nuvole ([2409:8a34:5f37:1974:abc5:99cd:a924:4e86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8396563f11csm24775517b3a.3.2026.05.11.02.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 02:11:37 -0700 (PDT) From: Pengyu Luo To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Sakari Ailus , Martin Kepplinger-Novakovic , Mauro Carvalho Chehab , Hans Verkuil , Sebastian Krzyszkowiak Cc: devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Pengyu Luo Subject: [PATCH v3 2/5] media: hi846: fix link frequency handling Date: Mon, 11 May 2026 17:09:21 +0800 Message-ID: <20260511090924.269106-3-mitltlatltl@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260511090924.269106-1-mitltlatltl@gmail.com> References: <20260511090924.269106-1-mitltlatltl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260511_021138_452266_C0E0F9EE X-CRM114-Status: GOOD ( 23.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org link frequency is tied to PLL configuration, lane count, and external clock rate, so use runtime here instead of hardcoding for specific configuration. To implement this, this commit did 1. dropped exposed link freqs as a v4l2_ctrl, since we are runtime now, it is inconvenient and unnecessary to expose it, and hi846_set_ctrl has nothing to do with it. 2. attached pll_cfg_2lane to current mode, and use it with clock, lane count to calculate link frequency, we use 2-lane config as default, but we can halve it easily for 4-lane case. 3. dropped mclk clock rate check. Fixes: e8c0882685f9 ("media: i2c: add driver for the SK Hynix Hi-846 8M pixel camera") Signed-off-by: Pengyu Luo --- drivers/media/i2c/hi846.c | 75 ++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c index 7f069aca0fce..befd54553df2 100644 --- a/drivers/media/i2c/hi846.c +++ b/drivers/media/i2c/hi846.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2021 Purism SPC -#include +#include #include #include #include @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -219,8 +220,8 @@ struct hi846_mode { /* Horizontal timing size */ u32 llp; - /* Link frequency needed for this resolution */ - u8 link_freq_index; + /* PLL configuration for 4-lane link at this resolution */ + u16 pll_cfg_4lane; u16 fps; @@ -1040,13 +1041,6 @@ static const char * const hi846_test_pattern_menu[] = { "Resolution Pattern", }; -#define FREQ_INDEX_640 0 -#define FREQ_INDEX_1280 1 -static const s64 hi846_link_freqs[] = { - [FREQ_INDEX_640] = 80000000, - [FREQ_INDEX_1280] = 200000000, -}; - static const struct hi846_reg_list hi846_init_regs_list_2lane = { .num_of_regs = ARRAY_SIZE(hi846_init_2lane), .regs = hi846_init_2lane, @@ -1061,7 +1055,7 @@ static const struct hi846_mode supported_modes[] = { { .width = 640, .height = 480, - .link_freq_index = FREQ_INDEX_640, + .pll_cfg_4lane = 0x4924, /* HI846_REG_PLL_CFG_MIPI2_H */ .fps = 120, .frame_len = 631, .llp = HI846_LINE_LENGTH, @@ -1086,7 +1080,7 @@ static const struct hi846_mode supported_modes[] = { { .width = 1280, .height = 720, - .link_freq_index = FREQ_INDEX_1280, + .pll_cfg_4lane = 0x4924, /* HI846_REG_PLL_CFG_MIPI2_H */ .fps = 90, .frame_len = 842, .llp = HI846_LINE_LENGTH, @@ -1112,7 +1106,7 @@ static const struct hi846_mode supported_modes[] = { { .width = 1632, .height = 1224, - .link_freq_index = FREQ_INDEX_1280, + .pll_cfg_4lane = 0x4924, /* HI846_REG_PLL_CFG_MIPI2_H */ .fps = 30, .frame_len = 2526, .llp = HI846_LINE_LENGTH, @@ -1161,7 +1155,6 @@ struct hi846 { struct v4l2_ctrl_handler ctrl_handler; u8 nr_lanes; - struct v4l2_ctrl *link_freq; struct v4l2_ctrl *pixel_rate; struct v4l2_ctrl *vblank; struct v4l2_ctrl *hblank; @@ -1192,21 +1185,37 @@ static const struct hi846_datafmt *hi846_find_datafmt(u32 code) return NULL; } -static inline u8 hi846_get_link_freq_index(struct hi846 *hi846) +static u64 +hi846_get_link_freq(struct hi846 *hi846, const struct hi846_mode *cur_mode) { - return hi846->cur_mode->link_freq_index; -} + u16 cfg = cur_mode->pll_cfg_4lane; + u64 mclk = clk_get_rate(hi846->clock); -static u64 hi846_get_link_freq(struct hi846 *hi846) -{ - u8 index = hi846_get_link_freq_index(hi846); + /* NOTE: 6, 7 actually map to 8, 10, but this won't be that big */ + u8 post_div1 = 1 + FIELD_GET(GENMASK(10, 8), cfg); + u8 post_div2 = 1 << FIELD_GET(GENMASK(12, 11), cfg); - return hi846_link_freqs[index]; + /* + * HI846_REG_PLL_CFG_MIPI1_H = 0x025a, it is fixed in listed modes + * [11:8]: 0x02 => pre_div = 3 + * [7:0]: 0x5a => multiplier = 90 + */ + u64 link_freq = mclk / 3 * 90 / post_div1 / post_div2; + /* + * for shared modes, since lane count is halved for 2-lane, then getting + * link_freq doubled to match the same data rate. Since 720x480 is + * 2-lane only(reg_list_4lane.num_of_regs == 0), no pll cfg for 4-lane, + * the pll cfg is for 2-lane, so use the cfg as is. + */ + if (2 == hi846->nr_lanes && cur_mode->reg_list_4lane.num_of_regs) + link_freq *= 2; + + return link_freq; } static u64 hi846_calc_pixel_rate(struct hi846 *hi846) { - u64 link_freq = hi846_get_link_freq(hi846); + u64 link_freq = hi846_get_link_freq(hi846, hi846->cur_mode); u64 pixel_rate = link_freq * 2 * hi846->nr_lanes; do_div(pixel_rate, HI846_RGB_DEPTH); @@ -1426,14 +1435,6 @@ static int hi846_init_controls(struct hi846 *hi846) ctrl_hdlr->lock = &hi846->mutex; - hi846->link_freq = - v4l2_ctrl_new_int_menu(ctrl_hdlr, &hi846_ctrl_ops, - V4L2_CID_LINK_FREQ, - ARRAY_SIZE(hi846_link_freqs) - 1, - 0, hi846_link_freqs); - if (hi846->link_freq) - hi846->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY; - hi846->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &hi846_ctrl_ops, V4L2_CID_PIXEL_RATE, 0, @@ -1503,10 +1504,10 @@ static int hi846_set_video_mode(struct hi846 *hi846, int fps) u64 frame_length; int ret = 0; int dummy_lines; - u64 link_freq = hi846_get_link_freq(hi846); + u64 link_freq = hi846_get_link_freq(hi846, hi846->cur_mode); dev_dbg(&client->dev, "%s: link freq: %llu\n", __func__, - hi846_get_link_freq(hi846)); + link_freq); do_div(link_freq, fps); frame_length = link_freq; @@ -1749,7 +1750,6 @@ static int hi846_set_format(struct v4l2_subdev *sd, mf->code = HI846_MEDIA_BUS_FORMAT; mf->field = V4L2_FIELD_NONE; - __v4l2_ctrl_s_ctrl(hi846->link_freq, hi846_get_link_freq_index(hi846)); __v4l2_ctrl_s_ctrl_int64(hi846->pixel_rate, hi846_calc_pixel_rate(hi846)); @@ -1950,16 +1950,17 @@ static int hi846_identify_module(struct hi846 *hi846) static s64 hi846_check_link_freqs(struct hi846 *hi846, struct v4l2_fwnode_endpoint *ep) { - const s64 *freqs = hi846_link_freqs; - int freqs_count = ARRAY_SIZE(hi846_link_freqs); + int freqs_count = ARRAY_SIZE(supported_modes); + u64 link_freq; int i, j; for (i = 0; i < freqs_count; i++) { + link_freq = hi846_get_link_freq(hi846, &supported_modes[i]); for (j = 0; j < ep->nr_of_link_frequencies; j++) - if (freqs[i] == ep->link_frequencies[j]) + if (link_freq == ep->link_frequencies[j]) break; if (j == ep->nr_of_link_frequencies) - return freqs[i]; + return link_freq; } return 0; -- 2.54.0