From patchwork Thu Feb 20 23:08:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13984595 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 24CBB265CBC for ; Thu, 20 Feb 2025 23:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740092938; cv=none; b=IZru0gYzvho7ZOWbq6SldbU+AB6EFB0tatqW7zQ7o8kZObHLwlt2bsCaKPulLsDeePgUREqRiZnCS1c9BuY6s6P08BRYgL79zJ3brg3qcRknwLObrez8XFp4m8tTuwIeB5mza6Cx3OBlGNvL6mFdj+6QHQwWoCrMLY4Udi05bFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740092938; c=relaxed/simple; bh=EzZQSdIx5D7T5oRoBm/8fSqgGLdREtHQcr2NCdkG5fY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ifPYz2txEnsu7KRGpMyLGQ/vtGH4yk/PtaBVpXCT7SjKIPDQaYTJB7wzqbH2FQpaXII5/PM7kttqDJbyizAKrVJkyGClAVZJUlLYSwVEgyreA6hl7GjbkM05Z34diNITAHEIscW96Cb26HYyn7PmORsTZI3y1b/DoBRqwsr6Hfw= 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=IF4Gcs0C; arc=none smtp.client-ip=209.85.218.51 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="IF4Gcs0C" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-aaec111762bso342569066b.2 for ; Thu, 20 Feb 2025 15:08:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740092934; x=1740697734; 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=NhX43RkJeHOzyL9QEiVx31rF6Y6JmPRuPUbmR6ly4C4=; b=IF4Gcs0CMpaRMqVqRSuVPbMmp/z+ZRHPyi6Nknw3jgAdz15CRjGyVRtKn9TDzV4AMK n24zi1nA1M2KJ/ipIx4F/d7lG72ItO4siDZTjO4rGCG1jzcCJlmQ82G3Q3pQOYGClgJ+ cU5vLMOVwCKCXH8YPy55YxVlKNKPhYynQQHk/e727sucKXrWO2Qv6Wm1KN+YVZiXS+c9 j9sQ+5HVWY9m3jORfiUaX+d/1ofic04EaI8SYBt8p/kcG+o+OqSuRES1cgyoVX6Dh7Lc OhsExoTjnLUqY+p3+y7CF1ZcpzDqo6TWwbLORtKsXq5fvw/t4FT+8WheMCN3K/X7Ze5z 00eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740092934; x=1740697734; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NhX43RkJeHOzyL9QEiVx31rF6Y6JmPRuPUbmR6ly4C4=; b=u3H7UPnNY/qxDqFGVR8RV0mTmUXGTqP9tHYCiJJJUljNaQKHRRa63yXoFHVdzpVQvR W4yA6IGAMkDPnP3asTIResgDcRCYtBATE1Dyw7PgAz6f4BlJr+W0Nh4X5MKNKxURUmpL uA83Wufkoy9qVgsI0tULD47JyJQ8nYkU1FiP7vFnJkBm0s8Ri4bkctXqlt5BNtxdyiDZ eCf4hVOzS5W/QYyJtD/07/e1WKq2DIwAaK1ZAwWKfvP5quGk/V5ReXHw63LCDqterp21 X7Myn0gZasxOs2wYrh43NDOCL9r/QRfyI+j1w9lHQtn3l4bNpMCSjlG6Mme9t9w3DwaD KeYQ== X-Forwarded-Encrypted: i=1; AJvYcCUNK/X7WYMHUB9FPdO4ievjEFeQ710yrs0+JYpQ3HeBIajlgQszxz3ekcitysOlJ0gW2rw=@lists.linux.dev X-Gm-Message-State: AOJu0YwBWU2X8R43MVWMAG+/m8l2jkKvhCUAaZli2hF37w6if399ZnAm W+LsFW2aoDUgVraBqunSw0lvgAleG7FlLDvq66gF/IiCqiNGHC70 X-Gm-Gg: ASbGnctahe9Jo7pjLSTFIWtHcF1jivKXHzeBVKuuvNraXIODQalAp10cGiqYf7V/41h 0cobsbG+/m1oe9Am6VfeclaFe8339A8GaNis4r60UD2AocaQVYbpzVvtR8SheUjIZfo8QRT9QyZ 1/f6o8WskTGMoLG3NMyoYAq3h4GlSXL2BCJOWtFFoQ2xp9uqiW/XBE61kSzd1OJW/aAAYv3FVnN 6OK8Io3QFryGqJq0jPEXsE7l2c59w8rQWbG6zfpUro55lKhGE2otMzIGMj6wcCpzIyeHGd2LkK2 vu+f151uDDr+rGhZRD70OoKUVI5x X-Google-Smtp-Source: AGHT+IHN9q1K9iy2cJqlLoBVyZt+NIVwf4Z/pfv0pnr1nZE9X5wgZJrRlMItfXGJSo5vo2ienwvsKA== X-Received: by 2002:a17:906:4fc7:b0:ab6:dbd2:df78 with SMTP id a640c23a62f3a-abc09d31cd2mr102596866b.35.1740092934282; Thu, 20 Feb 2025 15:08:54 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abb9654a6b2sm909107066b.135.2025.02.20.15.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 15:08:53 -0800 (PST) From: Cosmin Tanislav To: Cc: Dave Stevenson , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Sakari Ailus , Laurent Pinchart , linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Cosmin Tanislav Subject: [PATCH v2 6/6] media: i2c: imx219: implement configurable VC ID Date: Fri, 21 Feb 2025 01:08:14 +0200 Message-ID: <20250220230818.275262-7-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220230818.275262-1-demonsingur@gmail.com> References: <20250220230818.275262-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 IMX219 supports configuring the Virtual Channel ID used for image and embedded data streams. Signed-off-by: Cosmin Tanislav --- drivers/media/i2c/imx219.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 4c4ebe54f191b..ae93ac2bbe367 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -38,6 +38,8 @@ #define IMX219_MODE_STANDBY 0x00 #define IMX219_MODE_STREAMING 0x01 +#define IMX219_REG_CSI_CH_ID CCI_REG8(0x0110) + #define IMX219_REG_CSI_LANE_MODE CCI_REG8(0x0114) #define IMX219_CSI_2_LANE_MODE 0x01 #define IMX219_CSI_4_LANE_MODE 0x03 @@ -363,6 +365,9 @@ struct imx219 { /* Two or Four lanes */ u8 lanes; + + /* Virtual channel ID */ + u8 vc_id; }; static inline struct imx219 *to_imx219(struct v4l2_subdev *_sd) @@ -724,6 +729,12 @@ static int imx219_configure_lanes(struct imx219 *imx219) ARRAY_SIZE(imx219_4lane_regs), NULL); }; +static int imx219_configure_vc(struct imx219 *imx219) +{ + return cci_write(imx219->regmap, IMX219_REG_CSI_CH_ID, + imx219->vc_id, NULL); +} + static int imx219_start_streaming(struct imx219 *imx219, struct v4l2_subdev_state *state) { @@ -749,6 +760,13 @@ static int imx219_start_streaming(struct imx219 *imx219, goto err_rpm_put; } + /* Configure Virtual Channel ID */ + ret = imx219_configure_vc(imx219); + if (ret) { + dev_err(&client->dev, "%s failed to configure vc\n", __func__); + goto err_rpm_put; + } + /* Apply format and crop settings. */ ret = imx219_set_framefmt(imx219, state); if (ret) { @@ -994,6 +1012,7 @@ static int imx219_init_state(struct v4l2_subdev *sd, static int imx219_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_mbus_frame_desc *fd) { + struct imx219 *imx219 = to_imx219(sd); struct v4l2_subdev_state *state; u32 code; @@ -1006,7 +1025,7 @@ static int imx219_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, fd->entry[0].pixelcode = code; fd->entry[0].stream = 0; - fd->entry[0].bus.csi2.vc = 0; + fd->entry[0].bus.csi2.vc = imx219->vc_id; fd->entry[0].bus.csi2.dt = imx219_get_format_bpp(code) == 8 ? MIPI_CSI2_DT_RAW8 : MIPI_CSI2_DT_RAW10; @@ -1149,6 +1168,13 @@ static int imx219_check_hwcfg(struct device *dev, struct imx219 *imx219) } imx219->lanes = ep_cfg.bus.mipi_csi2.num_data_lanes; + if (ep_cfg.bus.mipi_csi2.num_vc_ids > 1) { + dev_err_probe(dev, -EINVAL, + "only 1 virtual channel id is supported\n"); + goto error_out; + } + imx219->vc_id = ep_cfg.bus.mipi_csi2.vc_ids[0]; + /* Check the link frequency set in device tree */ switch (imx219->lanes) { case 2: