From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7262B3BED74 for ; Mon, 11 May 2026 09:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778490699; cv=none; b=OUTIfRgibk+6UOEzbnQk+7JVDEHRCLnBAoC499kzz/rqRzIzMSrWnjxil5uEebgDLPUtv86Bo/3whWFBdiiHhqBxrWUp0KR0VCjeBDGfcxDoIElCw6pj/4U10dWfcbw/ricYSd9B6XH6prAX/FCUHQvg2woprOYFzAHtM1BLL3Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778490699; c=relaxed/simple; bh=BUFAulTNzVqetHKEgSJqSyl4CEAgDPbvCblJAnM2qJ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tHQyEINMRZLXCoxlCcMqTBtUJ7gQuEFP4PlYEnjUQPQkuM1RyIUznfZgr+3kfMxQ+SEcO/3rFY8D7brRFncGAfgdYIX9RfjAW3okuHdiDz0Iq8PfXoTdNBuLxHfXp2dECRoP3BWmqufLotrQX2o/asmnJLyF6W/UK5Cd1xmTCYM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=duzJm9ti; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="duzJm9ti" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82f9fdfc965so1690868b3a.1 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.linux.dev; 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=duzJm9tiZ6XVXlO39XVsln9OpJlZazz/tsfkx2gd0FYa2Ck8MrgRMgVEKrOrrb8yAo Ez1Zp+iuI8gJ7Zbngmfn9GcvYOTL209E06cTOKxd7yvBqyZ+jjlBZ5mhhUa8jD7ZWumH 8evInquaiu4U6hhK76SFRLaYDU4VQkylgBA5viCs4mj4/u3cY9ozUqFWbsxTR1kI1AY9 ANO+SoFG+aKbCJaPO67usnDRFx7nK1UKi4OM5gmanBnluYKmLyAF+qJTO3DIOvFQDoem bnGMgl0D+YOdlpUWWLJfSeYrCvrLvu2OJvZfkUMmCn38UQPJ3GhIHhZwkx7iDuSZlj0Y 1Qgw== 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=A3kTCC71KRFZNoJjWhRW6J1cjCtqa+gjlIV7sxJTCZjB22O1biEQtxB94we+t3X53N W1dpXNsxOdiCSGj/vFOR6huAhxw10bkoRMiF6WABVbr1fgeDSE5QesoeCbZEKOd1+1Di rOQ+cvYSMjaztx+lNsRQNEuREoNhg4N5lFlJMirmXMSTmAzu1KkNQLwQ4SJKqQeBrxaV cw8wlcuPYC+vQCporIdkMWzUSxD8l0Hlcz7Xntq0o0Z9EwgLcAFxrVZlwZ93+MJbY4Iu CkwqWGW0E3MIynBFP3kdPRyo7Zr/RTtGdda4a/C6BiVEz51/hpSbbf9UJLImwkUMkVK6 /9hw== X-Forwarded-Encrypted: i=1; AFNElJ/7cGocaj4Y/XeC6Zwn5dWnOxj8vtnbnD8UXoPEyNgmPOqoUuiuQUUpSQoz2rMIRl0B18Q=@lists.linux.dev X-Gm-Message-State: AOJu0Yx+kRKc72ALOwHVUPIQyksS75Dp9bjK7gOeLJVCI/ZW7WfoS7Rz jc7gy8ZJOHB1mNBJ9KLFaKq/oGAWgGaDPzLLtF/SDGIc4iRg5NsIK/AD X-Gm-Gg: Acq92OGzBvEDw3dbDRdDk/AbCWA8qVcHUOt0Wt1yCpC1TuF4EYVV+OFF/GBmS5Qm5UQ rU3kBON2pEtLK2Som1efNDeHgcAF2fKY+azpcavWDarAzKChA+2utYvd7Ug4R2GlVFk+b0/f6pU 40Vk5PNcnNs1SB5vNAOpr6L6XTqG6E69l2Gl7WF2mR8IlIXFyyqxSgo9wZoBmpPykWeL9KlLR0U 9XJmQr+mAwm3V8ks3xQ/DeHc1zvpqJbXAdzPGIefeCRZOqRz2oGjafaLW2ddq0swDUDz1wTijHo 3RHKzXgFF3SeOjA/K99OrvzKOMTwZ6PCBaXn6c31c0o8J59dsPa/zNDCQTGmzoRqXuRBeSVRZVC qfynQj5ZmDBE40Gm7Yj9AhOo+mBJwquZfam7M9TnyBaIyiZxQmBoUQnhDKn0w26MQMsA7WA2gAc woT33OVSIsXMEhK2eq4BGfMlDILSLB5agqnQ== 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> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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