From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCA19C43217 for ; Wed, 24 Nov 2021 17:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350026AbhKXSAl (ORCPT ); Wed, 24 Nov 2021 13:00:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350032AbhKXSAk (ORCPT ); Wed, 24 Nov 2021 13:00:40 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FBCEC06174A for ; Wed, 24 Nov 2021 09:57:30 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id y196so3233370wmc.3 for ; Wed, 24 Nov 2021 09:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UdUzS90xHBZQkZnmDjqybxrLaFmgOreexYGvvJh97Uk=; b=g71KBsBuksAmBudc/nDmkr2xbzpoKoWw2HmHdG4z3oQHHUD/USL/OObxTvdF6DLI57 6CtKNWarCK6psoTEontC4lvC221ejS1+VNob/psJfevI61hWERSYK6QYJQGriGCeWipK gw5RF7YRp5mZZblhouU0M3jKpz5GfTe55sUT/Cugz1JAfAgsoNQPOQe8JmahRR7+k9XK /QXzA1eg7hhNRscslFB7xB7xx2WHui0tzvEptsg8tSEoIUrcqL9hSn0j4V2G+8vANVSt bbpUe+1Z0WnJqwyHvGvQ+1CO9wWiiTfGIq4eks5ZPGSiTMMGPLXfs1+8680Nea2R8ic0 fIvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UdUzS90xHBZQkZnmDjqybxrLaFmgOreexYGvvJh97Uk=; b=1/gzAU/JC5zGwioC2hxhuvPz7o8Gm0MI/Nnn88I5G+wwLtjMStWuZ0idP0r9HH4Vwd Oz5KXgKr9AyKSjflRHGDE1OJ4B56KoetzB9aK18po+oLeNxSXy7twIr6CUNqVaF3W8jF P+ASuw+3YFrrrSv75n8xRmPpo22PMMHbyQJFLDAAunhu7BiXUPzWKzvaIRYWtwoosQiB dh5sXdAFppw64NqB8hVw5pTwl/QsGzVK33Y4I1MHzGCl3tyDe7lamUBMqWxQ/x/DN8D1 OrECSFMOy01pLUcRal8VmAgN7x1REIKzQkk4/8WUG7JG9Sq11j45fCZyHg7DbXIzE8yP CxeA== X-Gm-Message-State: AOAM5306JwszoBQuq53zvgYJzx/TrutPbnuoZpPFUw/kZeTw4QRnbmIq OFLhaDBtk8SM+XV4BZbBrgy9PgzG5fnMowMz X-Google-Smtp-Source: ABdhPJzJU5ixGinC8li+cyrjiz4VfAIpnc2JnuTUgspG759LQjJt5nJ/P0iWYlL6AFFgstTMyx84Yg== X-Received: by 2002:a05:600c:500d:: with SMTP id n13mr17392840wmr.174.1637776648425; Wed, 24 Nov 2021 09:57:28 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id s24sm380576wmj.26.2021.11.24.09.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 09:57:27 -0800 (PST) From: Bryan O'Donoghue To: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, robert.foss@linaro.org, jonathan@marek.ca Cc: andrey.konovalov@linaro.org, todor.too@gmail.com, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, jgrahsl@snap.com, hfink@snap.com, bryan.odonoghue@linaro.org Subject: [PATCH v2 09/19] media: camss: csid-170: set the right HALT_CMD when disabled Date: Wed, 24 Nov 2021 17:59:11 +0000 Message-Id: <20211124175921.1048375-10-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211124175921.1048375-1-bryan.odonoghue@linaro.org> References: <20211124175921.1048375-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Jonathan Marek Use the "HALT_CMD_RESUME_AT_FRAME_BOUNDARY" define instead of a "1" which is otherwise confusing, and add a "HALT_CMD_HALT_AT_FRAME_BOUNDARY" which is set when disabling. Fixes: eebe6d00e9bf ("media: camss: Add support for CSID hardware version Titan 170") Signed-off-by: Jonathan Marek Reviewed-by: Robert Foss Tested-by: Julian Grahsl Tested-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss-csid-170.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c index 2c84d40fe3e0..22a7d7ad6340 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-170.c +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c @@ -105,7 +105,8 @@ #define CSID_RDI_CTRL(rdi) ((IS_LITE ? 0x208 : 0x308)\ + 0x100 * (rdi)) #define RDI_CTRL_HALT_CMD 0 -#define ALT_CMD_RESUME_AT_FRAME_BOUNDARY 1 +#define HALT_CMD_HALT_AT_FRAME_BOUNDARY 0 +#define HALT_CMD_RESUME_AT_FRAME_BOUNDARY 1 #define RDI_CTRL_HALT_MODE 2 #define CSID_RDI_FRM_DROP_PATTERN(rdi) ((IS_LITE ? 0x20C : 0x30C)\ @@ -444,7 +445,10 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val |= 1 << CSI2_RX_CFG1_MISR_EN; writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG1); - val = 1 << RDI_CTRL_HALT_CMD; + if (enable) + val = HALT_CMD_RESUME_AT_FRAME_BOUNDARY << RDI_CTRL_HALT_CMD; + else + val = HALT_CMD_HALT_AT_FRAME_BOUNDARY << RDI_CTRL_HALT_CMD; writel_relaxed(val, csid->base + CSID_RDI_CTRL(0)); } -- 2.33.0