From patchwork Thu Sep 21 15:30:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9964151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2ADFB6020C for ; Thu, 21 Sep 2017 15:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20FC528F93 for ; Thu, 21 Sep 2017 15:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12F1229219; Thu, 21 Sep 2017 15:31:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C63322919C for ; Thu, 21 Sep 2017 15:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751813AbdIUPbD (ORCPT ); Thu, 21 Sep 2017 11:31:03 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:55447 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751687AbdIUPbC (ORCPT ); Thu, 21 Sep 2017 11:31:02 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1dv3RM-0001uB-Ta; Thu, 21 Sep 2017 17:31:00 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Dave Stevenson , Hans Verkuil , Sakari Ailus , Mauro Carvalho Chehab , Mats Randgaard , Steve Longerbeam , Philipp Zabel Subject: [PATCH v2 2/2] [media] imx: ask source subdevice for number of active data lanes Date: Thu, 21 Sep 2017 17:30:55 +0200 Message-Id: <20170921153055.16206-2-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Temporarily use g_mbus_config() to determine the number of active data lanes used by the transmitter. If g_mbus_config is not supported or does not return the number of active lines, default to using all connected data lines. Signed-off-by: Philipp Zabel Acked-by: Steve Longerbeam --- New in v2: - Use the active lanes reported via g_mbus_config(), if available, to configure the CSI2_N_LANES register correctly. --- drivers/staging/media/imx/imx6-mipi-csi2.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c index 5061f3f524fd5..cd19730d0159c 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -135,10 +135,8 @@ static void csi2_enable(struct csi2_dev *csi2, bool enable) } } -static void csi2_set_lanes(struct csi2_dev *csi2) +static void csi2_set_lanes(struct csi2_dev *csi2, int lanes) { - int lanes = csi2->bus.num_data_lanes; - writel(lanes - 1, csi2->base + CSI2_N_LANES); } @@ -301,6 +299,9 @@ static void csi2ipu_gasket_init(struct csi2_dev *csi2) static int csi2_start(struct csi2_dev *csi2) { + const u32 mask = V4L2_MBUS_CSI2_LANE_MASK; + struct v4l2_mbus_config cfg; + int lanes = 0; int ret; ret = clk_prepare_enable(csi2->pix_clk); @@ -316,7 +317,10 @@ static int csi2_start(struct csi2_dev *csi2) goto err_disable_clk; /* Step 4 */ - csi2_set_lanes(csi2); + ret = v4l2_subdev_call(csi2->src_sd, video, g_mbus_config, &cfg); + if (ret == 0) + lanes = (cfg.flags & mask) >> __ffs(mask); + csi2_set_lanes(csi2, lanes ?: csi2->bus.num_data_lanes); csi2_enable(csi2, true); /* Step 5 */