From patchwork Mon Feb 15 04:27:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 383105 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 387CEC433E0 for ; Mon, 15 Feb 2021 04:37:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E86664E61 for ; Mon, 15 Feb 2021 04:37:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbhBOEhY (ORCPT ); Sun, 14 Feb 2021 23:37:24 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:45902 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229904AbhBOEhV (ORCPT ); Sun, 14 Feb 2021 23:37:21 -0500 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 57D1D1AD3; Mon, 15 Feb 2021 05:28:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1613363330; bh=jO1FPVlIU1uZkPfFuAXmolHvIRTn9V46LrpG15zbo38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gp+PqvvpO9pXQJMQ4kjQDDIV7Ym1acfVi7peF6Yw6A9dW6O0hWl4AgGKaRfEBv13+ Tyk0FvJcoiT0PSvKcLCJ6ItCHqMhp3QS7gszmzlJT7xjj25Gdg1Hm69GbPcNFKrmDn QyKipbmV9PNGuHNfj9H2pcYHoYtUMw1zBdVxQm9c= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Rui Miguel Silva , Steve Longerbeam , Philipp Zabel , Ezequiel Garcia , Fabio Estevam Subject: [PATCH v2 51/77] media: imx: imx7-media-csi: Don't double-enable the CSI Date: Mon, 15 Feb 2021 06:27:15 +0200 Message-Id: <20210215042741.28850-52-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210215042741.28850-1-laurent.pinchart@ideasonboard.com> References: <20210215042741.28850-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The CSI is enabled at the end of imx7_csi_sw_reset(), called from imx7_csi_enable(), as well as at the end of imx7_csi_enable(). The latter is enough, remove the former. Signed-off-by: Laurent Pinchart Reviewed-by: Rui Miguel Silva --- drivers/staging/media/imx/imx7-media-csi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index fb09af335edf..ed389928fa4e 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -331,8 +331,6 @@ static void imx7_csi_sw_reset(struct imx7_csi *csi) usleep_range(2000, 3000); imx7_csi_irq_clear(csi); - - imx7_csi_hw_enable(csi); } static void imx7_csi_update_buf(struct imx7_csi *csi, dma_addr_t phys,