From patchwork Sat Feb 11 14:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 89794 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1pQr9q-001kGL-EL; Sat, 11 Feb 2023 14:47:20 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229676AbjBKOrQ (ORCPT + 1 other); Sat, 11 Feb 2023 09:47:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjBKOrP (ORCPT ); Sat, 11 Feb 2023 09:47:15 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FFF9144B6 for ; Sat, 11 Feb 2023 06:46:41 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id c1so3866270edt.4 for ; Sat, 11 Feb 2023 06:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=At5WvDKkNcOWkplR/dJTsQKEuzD9hrUAo21A4/rUxec=; b=wfwH0Bfi2CpxdAUmncYHWglK+QFVlyrKwkmpa1qPPxx9ajZdWsWH4EQpFdon9JRIic 4+2aJ3omS1g0NQzjjOqOhx3i92p+j77VY+BcNXHGyITeMcjzx+K8pkU93Zw898YEzX5R lYhK9OOJowHUQZsAjAG/pW1XkVogwAkI7b2FAsnWRi6QDPhjfcsOp+gaGksN6jRVML8C WLrAqCo6Qo9zGVf0eRk7QcF2pTZsb1v82hgv9hJpxxYmcU5TpZ+bUM23dJTKYmDB1BV+ r5vCB1YFAi8cVgTNdI7BIzcCGvGzYgzQbh4824g0yghUQtlaIwT49/qPHpxQxFsiCWVi 2VlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=At5WvDKkNcOWkplR/dJTsQKEuzD9hrUAo21A4/rUxec=; b=jd42d0k6FoSatuAdhjkCJfqiyTaFDAvUU1rhqzPGHlXvNLIQeig6GbVnplUsanuCp0 sBPMhA3ph8QND9m9hmvI5c7Epsd5nr4qSkmDtLm/WAd6RyZQrg3iXkeQfwifEdscMpmK RKGnsvY0Mj4hlOtJ1isOJdNDYf189oHAcmdD0Dg04mC6kVO0d2q1BORAZM1pfbiRMmQ9 08MNfK0d9gv2D5kaiIy1OlcaGinyij6Dn9ZBaLFG9t0UjS5OinkOD4gObppiBGU3Rlmy RfZfxFXq0dYdsbMzOhwExFUoie+UyEGmuAdXbEgtWNaRImQdihJr+0dFa4OVPQyIkzzS s3KQ== X-Gm-Message-State: AO0yUKXIdQfWPbNqTRJmyTfLTihMGGEKTWUM01ZVkgQHSl4TLCsYMm9n 5mRfTyndlC/8LNO2QhFCuQqIWw== X-Google-Smtp-Source: AK7set/74y9Mm210hoh6SmKH7HmluvFaWhx+S99Alej+1fs9ucdMCg9NaNGI/J4bYQCWlPYUPyu1XQ== X-Received: by 2002:a50:d719:0:b0:4ac:bdf7:dffd with SMTP id t25-20020a50d719000000b004acbdf7dffdmr239261edi.12.1676126798966; Sat, 11 Feb 2023 06:46:38 -0800 (PST) Received: from sleipner.berto.se (p54ac5802.dip0.t-ipconnect.de. [84.172.88.2]) by smtp.googlemail.com with ESMTPSA id s6-20020a50d486000000b004aab36ad060sm3802854edi.92.2023.02.11.06.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 06:46:38 -0800 (PST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Mauro Carvalho Chehab , Greg Kroah-Hartman , linux-media@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH] media: staging: max96712: Add support for 3-lane C-PHY Date: Sat, 11 Feb 2023 15:46:14 +0100 Message-Id: <20230211144614.3816247-1-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no Add basic support for outputting the test patterns on a 3-lane CSI-2 C-PHY bus. As the driver only can output frames form its internal test pattern generator, enabling C-PHY output is as simple as setting the output mode to C-PHY instead of D-PHY. Signed-off-by: Niklas Söderlund --- drivers/staging/media/max96712/max96712.c | 36 +++++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/max96712/max96712.c b/drivers/staging/media/max96712/max96712.c index 99b333b68198..d93dd985fb27 100644 --- a/drivers/staging/media/max96712/max96712.c +++ b/drivers/staging/media/max96712/max96712.c @@ -30,6 +30,7 @@ struct max96712_priv { struct regmap *regmap; struct gpio_desc *gpiod_pwdn; + bool cphy; struct v4l2_mbus_config_mipi_csi2 mipi; struct v4l2_subdev sd; @@ -127,10 +128,18 @@ static void max96712_mipi_configure(struct max96712_priv *priv) /* Select 2x4 mode. */ max96712_write(priv, 0x8a0, 0x04); - /* Configure a 4-lane DPHY using PHY0 and PHY1. */ /* TODO: Add support for 2-lane and 1-lane configurations. */ - /* TODO: Add support CPHY mode. */ - max96712_write(priv, 0x94a, 0xc0); + if (priv->cphy) { + /* Configure a 3-lane C-PHY using PHY0 and PHY1. */ + max96712_write(priv, 0x94a, 0xa0); + + /* Configure C-PHY timings. */ + max96712_write(priv, 0x8ad, 0x3f); + max96712_write(priv, 0x8ae, 0x7d); + } else { + /* Configure a 4-lane D-PHY using PHY0 and PHY1. */ + max96712_write(priv, 0x94a, 0xc0); + } /* Configure lane mapping for PHY0 and PHY1. */ /* TODO: Add support for lane swapping. */ @@ -332,8 +341,9 @@ static int max96712_parse_dt(struct max96712_priv *priv) { struct fwnode_handle *ep; struct v4l2_fwnode_endpoint v4l2_ep = { - .bus_type = V4L2_MBUS_CSI2_DPHY + .bus_type = V4L2_MBUS_UNKNOWN, }; + unsigned int supported_lanes; int ret; ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(&priv->client->dev), 4, @@ -350,8 +360,22 @@ static int max96712_parse_dt(struct max96712_priv *priv) return -EINVAL; } - if (v4l2_ep.bus.mipi_csi2.num_data_lanes != 4) { - dev_err(&priv->client->dev, "Only 4 data lanes supported\n"); + switch (v4l2_ep.bus_type) { + case V4L2_MBUS_CSI2_DPHY: + supported_lanes = 4; + priv->cphy = false; + break; + case V4L2_MBUS_CSI2_CPHY: + supported_lanes = 3; + priv->cphy = true; + break; + default: + dev_err(&priv->client->dev, "Unsupported bus-type %u\n", v4l2_ep.bus_type); + return -EINVAL; + } + + if (v4l2_ep.bus.mipi_csi2.num_data_lanes != supported_lanes) { + dev_err(&priv->client->dev, "Only %u data lanes supported\n", supported_lanes); return -EINVAL; }