From patchwork Wed Nov 17 09:27:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 12692882 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2653AC433F5 for ; Wed, 17 Nov 2021 09:31:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC55963238 for ; Wed, 17 Nov 2021 09:31:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC55963238 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=puri.sm Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=lRqFGR3bW7I5PHMYXEYll/dILjAxA7+kxbpA1vW2pDc=; b=KGldZRYroFAt/D r0lOf5xC0jpbqbouu0MW8zPPgm6LPtvs92JmgHtjknFzCNNQBOaQHdoJ14nRFWp4v/GA9QIN80xIY G5XpiZFpzD0y7puK6YWEUZ5eoUpgJSfZz8v+9OIg1IWAc9h2oF/cjflZkvei4OzgXkxAH4VgePZUY 5zyvOdKQLtkcZtEGttFBe/ywl3zaKZJOEUqdi7kWRU6O4cwQF129EH3SQSVyLIvyTHf+L+kBi3v5n SrFm/pzIblo4vM+etXwgIuaZ6qmCGsOMn0tMf9l0NhwGpf5ttoRDkOZ5YLbF5TJz/QOHi1yfUchUr JgmDr989HF4mLYLF6rTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnHGN-004FuN-HP; Wed, 17 Nov 2021 09:29:55 +0000 Received: from comms.puri.sm ([159.203.221.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnHEb-004F9x-1A for linux-arm-kernel@lists.infradead.org; Wed, 17 Nov 2021 09:28:06 +0000 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 979DFDF722; Wed, 17 Nov 2021 01:27:31 -0800 (PST) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4qV44hPShOAV; Wed, 17 Nov 2021 01:27:30 -0800 (PST) From: Martin Kepplinger To: rmfrfs@gmail.com, laurent.pinchart@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, shawnguo@kernel.org Cc: kernel@pengutronix.de, kernel@puri.sm, linux-imx@nxp.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Kepplinger Subject: [PATCH 1/2] media: imx: imx7-media-csi: add support for imx8mq Date: Wed, 17 Nov 2021 10:27:09 +0100 Message-Id: <20211117092710.3084034-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211117_012805_113184_8F3207F9 X-CRM114-Status: GOOD ( 16.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Modeled after the NXP driver mx6s_capture.c that this driver is based on, imx8mq needs different settings for the baseaddr_switch mechanism. Define the needed bits and set that for imx8mq. Without these settings, the system will "sometimes" hang completely when starting to stream (the interrupt will never be called). Signed-off-by: Martin Kepplinger --- drivers/staging/media/imx/imx7-media-csi.c | 34 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 2288dadb2683..8619cf2fc694 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +123,10 @@ #define BIT_DATA_FROM_MIPI BIT(22) #define BIT_MIPI_YU_SWAP BIT(21) #define BIT_MIPI_DOUBLE_CMPNT BIT(20) +#define BIT_MASK_OPTION_FIRST_FRAME (0 << 18) +#define BIT_MASK_OPTION_CSI_EN (1 << 18) +#define BIT_MASK_OPTION_SECOND_FRAME (2 << 18) +#define BIT_MASK_OPTION_ON_DATA (3 << 18) #define BIT_BASEADDR_CHG_ERR_EN BIT(9) #define BIT_BASEADDR_SWITCH_SEL BIT(5) #define BIT_BASEADDR_SWITCH_EN BIT(4) @@ -154,6 +159,12 @@ #define CSI_CSICR18 0x48 #define CSI_CSICR19 0x4c +enum imx_soc { + IMX6UL = 0, + IMX7, + IMX8MQ, +}; + struct imx7_csi { struct device *dev; struct v4l2_subdev sd; @@ -189,6 +200,8 @@ struct imx7_csi { bool is_csi2; struct completion last_eof_completion; + + enum imx_soc type; }; static struct imx7_csi * @@ -537,6 +550,16 @@ static void imx7_csi_deinit(struct imx7_csi *csi, clk_disable_unprepare(csi->mclk); } +static void imx8mq_baseaddr_switch(struct imx7_csi *csi) +{ + u32 cr18 = imx7_csi_reg_read(csi, CSI_CSICR18); + + cr18 |= BIT_BASEADDR_SWITCH_EN | BIT_BASEADDR_SWITCH_SEL | + BIT_BASEADDR_CHG_ERR_EN; + cr18 |= BIT_MASK_OPTION_SECOND_FRAME; + imx7_csi_reg_write(csi, cr18, CSI_CSICR18); +} + static void imx7_csi_enable(struct imx7_csi *csi) { /* Clear the Rx FIFO and reflash the DMA controller. */ @@ -551,7 +574,11 @@ static void imx7_csi_enable(struct imx7_csi *csi) /* Enable the RxFIFO DMA and the CSI. */ imx7_csi_dmareq_rff_enable(csi); + imx7_csi_hw_enable(csi); + + if (csi->type == IMX8MQ) + imx8mq_baseaddr_switch(csi); } static void imx7_csi_disable(struct imx7_csi *csi) @@ -1155,6 +1182,8 @@ static int imx7_csi_probe(struct platform_device *pdev) if (IS_ERR(csi->regbase)) return PTR_ERR(csi->regbase); + csi->type = (enum imx_soc)of_device_get_match_data(&pdev->dev); + spin_lock_init(&csi->irqlock); mutex_init(&csi->lock); @@ -1249,8 +1278,9 @@ static int imx7_csi_remove(struct platform_device *pdev) } static const struct of_device_id imx7_csi_of_match[] = { - { .compatible = "fsl,imx7-csi" }, - { .compatible = "fsl,imx6ul-csi" }, + { .compatible = "fsl,imx8mq-csi", .data = (void *)IMX8MQ }, + { .compatible = "fsl,imx7-csi", .data = (void *)IMX7 }, + { .compatible = "fsl,imx6ul-csi", .data = (void *)IMX6UL }, { }, }; MODULE_DEVICE_TABLE(of, imx7_csi_of_match); From patchwork Wed Nov 17 09:27:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 12692881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05A53C433F5 for ; Wed, 17 Nov 2021 09:30:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C929A63238 for ; Wed, 17 Nov 2021 09:30:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C929A63238 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=puri.sm Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kz3x8XEsls7wFHaNz9nLrwQOGmyJguHKMDPCeLAMjXU=; b=qhjADncglRegYt fxbHnVmWUwvKnWaGXp4+5M4kzUFXbSU22XrZqBDPyGsQ6LHJOBKTpM2sX8sOwzM3BNz3FTo7v+kUf GADZtJX0BqK03XeR1o1jJgZaFeDa7pKa6Hu5CgPonKxV29zuiRiB60XlDjH1ZWQ1FqfJaKVHmViY+ QBGNMJsY+zxMegrZpf1P2eZbJlrBzZy48TGMf9S47dznKePoW0PRTuihng5lNkTYEFZnRlSY7fBtv JhPzZ5g2MWgoJuyTrHfmlsIyKrG+u5VxwaIng880oenB56y4zCySbUAWJVI+NGAg5ScCJGexmZxX3 TofupnHfYwRZ8XIpOHqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnHFb-004FWm-Fs; Wed, 17 Nov 2021 09:29:09 +0000 Received: from comms.puri.sm ([159.203.221.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnHEb-004FBc-Q9 for linux-arm-kernel@lists.infradead.org; Wed, 17 Nov 2021 09:28:08 +0000 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 5B7B5DF734; Wed, 17 Nov 2021 01:27:35 -0800 (PST) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oa6fksCSCQFO; Wed, 17 Nov 2021 01:27:34 -0800 (PST) From: Martin Kepplinger To: rmfrfs@gmail.com, laurent.pinchart@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, shawnguo@kernel.org Cc: kernel@pengutronix.de, kernel@puri.sm, linux-imx@nxp.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Kepplinger Subject: [PATCH 2/2] dt-bindings: media: document imx8mq support for imx7-csi Date: Wed, 17 Nov 2021 10:27:10 +0100 Message-Id: <20211117092710.3084034-2-martin.kepplinger@puri.sm> In-Reply-To: <20211117092710.3084034-1-martin.kepplinger@puri.sm> References: <20211117092710.3084034-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211117_012805_869403_DD6C95FB X-CRM114-Status: UNSURE ( 7.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the fsl,imx8mq-csi compatible string to the bindings for nxp,imx7-csi since the driver explicitly handles that now. Signed-off-by: Martin Kepplinger Reviewed-by: Laurent Pinchart --- Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml b/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml index 5922a2795167..4f7b78265336 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml @@ -17,6 +17,7 @@ properties: compatible: oneOf: - enum: + - fsl,imx8mq-csi - fsl,imx7-csi - fsl,imx6ul-csi - items: