From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 7BE34569F0B for ; Wed, 14 Oct 2026 17:54:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792000479; cv=none; b=qr9no9QrMTRkpOt4iAmV+c2JWjroynGXRbNasFT/76QBhvIhfzIFnJdE3+GjGhAxgqBO2XcSs7TQ+kihmamSXNeRrIQd8SqZNU3ruiCq1w+WLH6LhDGBuL3C5YJ5IGQbsCo18dkzTNHPn95L28B6+2PY0c641vYIcn8BmflqUsU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792000479; c=relaxed/simple; bh=Ygt58a39ODK5Ix55P49F6dWVJjCA0eX3r3+KfduSHQY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uQ1RyWZO6R2AJiDEwb3FJ26xZVjCrYYpMW2VuZAQHGqS3lS/cAv7bose0GQLMPYqf1+is/v7H8sMblmm1EqpzuIcZsoBOyFupIkO5XOslyzCUTLj8nJAZEuO+t0tYO974K2HwB2Pl6FXEt0/W+IDWw7RdUVstEjsVoaLV/jRX1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=KzFE4fLu; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KzFE4fLu" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4a02718da81so35726205e9.1 for ; Wed, 14 Oct 2026 10:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1792000475; x=1792605275; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZGCCybkG7GF2ABFeMy61l6UkIcxmTI9+K+xoGadulns=; b=KzFE4fLujEHvokLW/rwZPiKiU2oe9h/kyvycrsMMvL/AlTSSyHbk9405q2FkcSLl0l OeBMh2443lb+IsJ11OPAIw3kHpDNwQofzjhWJHLnajkRHSLXlKLEAkCHlReV1kAbJaaM 07dF0BdcBllB7W8cSRHKeoAGUKdtIKddO1IOKFSwkAeZiV+QphGoP/ZRHbj/PvaM3f9Z Zhz9gcwgR4r8uYFASJv36oialvcLk7pe/GKCCLbj/zXJyVeqVIKnchbW7zZv8MqPpSWl hiIkDyOXOKEaxTcoDT21YFgZvRIRhi+2FceUeIR9/bCq6N/C/5h80W91dg8vzOgNsSqF Gvzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792000475; x=1792605275; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ZGCCybkG7GF2ABFeMy61l6UkIcxmTI9+K+xoGadulns=; b=ulPFT26ksTSHqZEB85yDyVyPRdWncMMNttklLEDE+hActvR8HqN/ktc0xO82MeTrdt KULZtZ4RtRzdKyGCA4/fc6dHBWcQcq6bJuZvK6EwQcgne3lO0zZwuegFEkuj6HlNrXsY nVUwbhzc4GnHxgbtSG3HNC/nmuKLlDV9XcXkIl0T6NIgrAmQb68NldpRkd0sJ5hhdHjv pTmXFtpuSNycY/rJKpcK8qbDW+fxOEgsY4dkTPYOKhek/34AWv/QxY5njJIVKh4KV0ah z2PtDL252B9MIcOX3J9fNGqeXz9ZeQB9QA+IrwsM0V8uZ2iWnKaDQgzUAiCiU536G3XG /RiQ== X-Forwarded-Encrypted: i=1; AKwUvBwWJfP3KLQD/igleMH0icc8mVUv5BcQ4+i+ZW1rG7jzJjOYS5QK0K0aymVL/o1rasnGQINRRRSf4QR8RXI=@vger.kernel.org X-Gm-Message-State: AFq9FYITPVRK0l4UI+P1yC1AZ6Lz/KivGiCaVovWtGBiwNV1zEJLxIGH kweCkTT/nRlIYF+G3HrkCyRwQGr+J0cq4BsGxsmFxMgo2XP6AXJyAk5PMCnaDDYqkFM= X-Gm-Gg: AYBFou17va/JnV38CFqIxSVwRZaYRxfz123VMUgOAwWKPzcQWo+TfX1yVsgjFc2W1fe OQxm9BnvYNnOlYdFxN/E88F4SDzm8o8pPY3FmWJo9XG6j3ID9HL3lr8qkG+YNUYzQIYAZdfubYC x5c3CuPaev3hzFhTpKuJlrazkC5MZkvZCAee8sgLKDGXZtR1UQjmRPKlFUOUmF9/Cj5m8PsJqP1 Ied+fu+TXWxS1YtQu3ZJluCDd9qRVIxm/Cmmc4hGdes+AmoxXLy77yko8iKn4XP77H9f/stqJd1 i9EKmRWJX5TJcylfvQUsbOw/EtfhFdyGTRErGcbYVdy6rMSuVA4I5hhKg2/0ISBjUB3TbA9cKou VUo79kkwaF23YSr2ZHBoN4rjRLvzbu+8jJQ5ZKNv11vp23g/XgGrDzfzgE1IfRMYy5ZUsVODVxT AVV1lpaZIPdm6XjZJ2docRU5IEa52noIv7mqPMLhO2ZmL26TQxoKdUMH7exrNhW0ieUyt7Xv9k8 GGgcC9Frr0RFmlsaQz1QS7QqLLnBY2PQWEjxavd6e7pmma1zw== X-Received: by 2002:a05:600c:c104:b0:4a1:96cd:2f6f with SMTP id 5b1f17b1804b1-4a196cd328dmr190156275e9.1.1792000473800; Wed, 14 Oct 2026 10:54:33 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4a1bd986095sm8188395e9.7.2026.10.14.10.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 10:54:33 -0700 (PDT) From: Dave Stevenson Date: Wed, 14 Oct 2026 18:54:27 +0100 Subject: [PATCH v3 06/14] media: sony-starvis2: Allow runtime control of link frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261014-media-starvis2-v3-6-c958362b5d06@raspberrypi.com> References: <20261014-media-starvis2-v3-0-c958362b5d06@raspberrypi.com> In-Reply-To: <20261014-media-starvis2-v3-0-c958362b5d06@raspberrypi.com> To: Sakari Ailus , Jai Luthra , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Laurent Pinchart , Alexander Shiyan , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dave Stevenson X-Mailer: b4 0.14.1 DT allows configuration of multiple link frequencies. V4L2_CID_LINK_FREQ allows read write control. Join these up so that link frequency can be configured at run time, as long as the sensor isn't streaming. Signed-off-by: Dave Stevenson --- drivers/media/i2c/sony-starvis2.c | 75 ++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/drivers/media/i2c/sony-starvis2.c b/drivers/media/i2c/sony-starvis2.c index 1f3b33a5e44d..72fb037d7dbe 100644 --- a/drivers/media/i2c/sony-starvis2.c +++ b/drivers/media/i2c/sony-starvis2.c @@ -725,6 +725,7 @@ struct starvis2 { struct v4l2_ctrl *exposure; struct v4l2_ctrl *vblank; struct v4l2_ctrl *hblank; + struct v4l2_ctrl *link_freq; /* Track VMAX for exposure updates */ u32 vmax; @@ -755,6 +756,7 @@ static int starvis2_set_ctrl(struct v4l2_ctrl *ctrl) struct starvis2 *starvis2 = container_of_const(ctrl->handler, struct starvis2, ctrl_handler); struct i2c_client *client = v4l2_get_subdevdata(&starvis2->sd); + const struct starvis2_variant *variant = starvis2->variant; const struct v4l2_mbus_framefmt *format; struct v4l2_subdev_state *state; int ret = 0; @@ -778,6 +780,25 @@ static int starvis2_set_ctrl(struct v4l2_ctrl *ctrl) return ret; } + if (ctrl->id == V4L2_CID_LINK_FREQ) { + u32 hmax = variant->hmax_min_link_freq[ctrl->val]; + s32 hblank; + + if (starvis2->lane_mode == STARVIS2_LANEMODE_4L) + hmax = max(hmax >> 1, variant->hmax_min_pixel_array); + + hblank = hmax * variant->pix_per_clk - + variant->active_area.width; + + ret = __v4l2_ctrl_modify_range(starvis2->hblank, + hblank, + starvis2->hblank->maximum, + starvis2->hblank->step, + hblank); + if (ret) + return ret; + } + /* * Only apply control values when device is powered on (RPM ACTIVE) * and streaming (usage count != 0) @@ -824,6 +845,12 @@ static int starvis2_set_ctrl(struct v4l2_ctrl *ctrl) cci_write(starvis2->cci, STARVIS2_REG_WINMODEV, ctrl->val, &ret); break; + case V4L2_CID_LINK_FREQ: + /* The STARVIS2_LINK_FREQ_ enums match up with the register */ + cci_write(starvis2->cci, STARVIS2_REG_DATARATE_SEL, ctrl->val, + &ret); + break; + default: dev_warn(&client->dev, "ctrl(id:0x%x,val:0x%x) is not handled\n", @@ -938,9 +965,6 @@ static int starvis2_write_common(struct starvis2 *starvis2) cci_write(starvis2->cci, STARVIS2_REG_INCK_SEL, starvis2->inck_sel_val, &ret); - cci_write(starvis2->cci, STARVIS2_REG_DATARATE_SEL, - __fls(starvis2->link_freq_bitmap), - &ret); cci_write(starvis2->cci, STARVIS2_REG_LANEMODE, starvis2->lane_mode, &ret); @@ -1018,6 +1042,7 @@ static int starvis2_enable_streams(struct v4l2_subdev *sd, goto err_rpm_put; } + __v4l2_ctrl_grab(starvis2->link_freq, true); return 0; err_rpm_put: @@ -1042,6 +1067,8 @@ static int starvis2_disable_streams(struct v4l2_subdev *sd, if (ret) dev_err(&client->dev, "%s failed to stop stream\n", __func__); + __v4l2_ctrl_grab(starvis2->link_freq, false); + pm_runtime_put(&client->dev); return ret; @@ -1208,7 +1235,6 @@ static int starvis2_init_controls(struct starvis2 *starvis2) struct i2c_client *client = v4l2_get_subdevdata(&starvis2->sd); const struct starvis2_variant *variant = starvis2->variant; struct v4l2_fwnode_device_properties props; - struct v4l2_ctrl *link_freq; s32 hblank, max_hblank, vblank, max_vblank; u32 hmax; int ret; @@ -1224,25 +1250,26 @@ static int starvis2_init_controls(struct starvis2 *starvis2) starvis2->vmax = starvis2->variant->vmax_default; - hmax = variant->hmax_min_link_freq[__fls(starvis2->link_freq_bitmap)]; - if (starvis2->lane_mode == STARVIS2_LANEMODE_4L) - hmax = max(hmax >> 1, variant->hmax_min_pixel_array); - /* PIXEL_RATE is fixed and read-only */ v4l2_ctrl_new_std(ctrl_hdlr, &starvis2_ctrl_ops, V4L2_CID_PIXEL_RATE, starvis2->variant->pixel_rate, starvis2->variant->pixel_rate, 1, starvis2->variant->pixel_rate); - /* LINK_FREQ is also read only */ - link_freq = v4l2_ctrl_new_int_menu(ctrl_hdlr, &starvis2_ctrl_ops, - V4L2_CID_LINK_FREQ, - ARRAY_SIZE(link_freqs) - 1, - __ffs(starvis2->link_freq_bitmap), - link_freqs); - - if (link_freq) - link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY; + starvis2->link_freq = + v4l2_ctrl_new_int_menu(ctrl_hdlr, &starvis2_ctrl_ops, + V4L2_CID_LINK_FREQ, + __fls(starvis2->link_freq_bitmap), + __ffs(starvis2->link_freq_bitmap), + link_freqs); + if (!starvis2->link_freq) + goto err_free_handler; + + v4l2_ctrl_modify_range(starvis2->link_freq, + __ffs(starvis2->link_freq_bitmap), + __fls(starvis2->link_freq_bitmap), + ~(starvis2->link_freq_bitmap), + __ffs(starvis2->link_freq_bitmap)); vblank = starvis2->vmax - starvis2->variant->active_area.height; max_vblank = STARVIS2_VMAX_MAX - starvis2->variant->active_area.height; @@ -1250,6 +1277,10 @@ static int starvis2_init_controls(struct starvis2 *starvis2) V4L2_CID_VBLANK, vblank, max_vblank, 2, vblank); + hmax = variant->hmax_min_link_freq[starvis2->link_freq->val]; + if (starvis2->lane_mode == STARVIS2_LANEMODE_4L) + hmax = max(hmax >> 1, variant->hmax_min_pixel_array); + hblank = hmax * starvis2->variant->pix_per_clk - starvis2->variant->active_area.width; max_hblank = STARVIS2_HMAX_MAX * starvis2->variant->pix_per_clk - @@ -1285,16 +1316,20 @@ static int starvis2_init_controls(struct starvis2 *starvis2) v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &starvis2_ctrl_ops, &props); if (ctrl_hdlr->error) { - ret = ctrl_hdlr->error; dev_err(&client->dev, "%s control init failed (%d)\n", __func__, ret); - v4l2_ctrl_handler_free(ctrl_hdlr); - return ret; + goto err_free_handler; } starvis2->sd.ctrl_handler = ctrl_hdlr; return 0; + +err_free_handler: + ret = ctrl_hdlr->error; + v4l2_ctrl_handler_free(ctrl_hdlr); + + return ret; } static int starvis2_check_hwcfg(struct device *dev, struct starvis2 *starvis2) -- 2.34.1