Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3757030pxj; Tue, 11 May 2021 11:10:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5SXTep47NIZ0Tbi5S8K6oGw/EXOXLvNR2vz6ZR3TCjKyMTfo+amZrWNBGZeJHNbIBB7iV X-Received: by 2002:a17:906:8468:: with SMTP id hx8mr33093277ejc.18.1620756622847; Tue, 11 May 2021 11:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620756622; cv=none; d=google.com; s=arc-20160816; b=P/UlphozyO1Cwk/4WHF0RK8HBKqCOEJPgrKsOKQgCmqBw/OVMoXv9akxrSS8s6GQcR 8/VoxSznvDQkAhQHs8Q530CK56Gu2BhzvChy95ehWRtLcxGqJZXzD+wBQ6xP1wCDuwPX jJco/oMnv+1LOcrzhnr7RYRwcCAmgcIfHUwF90ng/9eydoUzblyt/8ngq+QyFj9f8/W9 ZC/5fTVQoqlEA6xm7w/S6OkusFQYsxq+nzLUdRaSPe701Ecas+JlOmY/JS+oPNWcL+w0 ZYCfcieOW6XXP9Lvd3zM1aI79WKrTxMWnJFU0Lx9uqX37Q2j59FHsAEjrvNGYMGINwyM 8Ieg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gtQrgUl4tCQEqsiKDMMoF7DBtOLlclZjKI0ULmAjCz4=; b=bljtC4LuAP1WIlV5YMe4ymR7P5IOAyb2k5FHqREVbnRud/4jlJcghobSTdr/frJrKx VqKQ0h5dfu3JinTmz/I3pUjOL9Y/XLmCAzHOaRPICR6K6SDPYL9jKFTXY5Ox1F/nKhte aN/iabyOQ1ZJWK46eYVFPl5qMclwXsupsVGXiV21LoSIEhqRNY1k77UbUqWDiA8FH0ug pgGhmVOquTTfcZLHoGr5MvaC5A1v9glWp8vKrD0Crw5vrJG/w2pN+YKm/3hIvzS9OqVw KNSv9oCXs+xpJBXHzxGLDaoAVGtT9PrwebQPiqYl+oSogeXF8A4g1KMa3qxBHGxfMi4n VORg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marek-ca.20150623.gappssmtp.com header.s=20150623 header.b=1WFSioGy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j2si17252132edr.305.2021.05.11.11.09.57; Tue, 11 May 2021 11:10:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@marek-ca.20150623.gappssmtp.com header.s=20150623 header.b=1WFSioGy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232179AbhEKSJg (ORCPT + 99 others); Tue, 11 May 2021 14:09:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232065AbhEKSJT (ORCPT ); Tue, 11 May 2021 14:09:19 -0400 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CCC0C061574 for ; Tue, 11 May 2021 11:08:12 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id a2so19651951qkh.11 for ; Tue, 11 May 2021 11:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gtQrgUl4tCQEqsiKDMMoF7DBtOLlclZjKI0ULmAjCz4=; b=1WFSioGyN6TjcAoY/Uodm0esYGQDy8QrqaXNa7fXQdhSjUauy5XW32oK83xHt/iTNp K5KWmSVRXLjjUvV+7nKtQuJnMCWyE8CJOP+jGBD8MbhDWVw43y76oIGEMKnYO5F/9qKv XKxSd+Xxo0nNH/TD0PTR5CkAiP1yAxMaJl8rGZbT9xOEC4NAKuFElBvKWURtDxDVflEg nC0IbbnX68g0xlpIudsLZAgxNZxJQS/i2Nm4VoZyiDjgg16Ze54O/qaZnJaV5aT9o6BL H+k1aIOKrmyeHEHg70nlT4aiBvnAe0d0Mz73RpfCR7zdG/NmUNJtpsnH5RsrhoHeeE/+ /UGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gtQrgUl4tCQEqsiKDMMoF7DBtOLlclZjKI0ULmAjCz4=; b=ChjxfXxZ3TJVxxI9xfvV7m2OkvfKT03JmDc6L8V4osQADZ7Zba1cua0oA1vndJzK67 3cqrbo2tZ5JLAIcS5I/E97PAbRKyGW+DhX1psNczL5C4XDtBofrmtRFvbolVozPh1XRv +7RopjuyTKesrqu/wb4gF2acQ8XiD8G4pobd4W6KZ7LVRwCLvRPJOQy1+WJLd+dVCIxZ FlgeeE450n7JI9lseshH2HnyAQ1/iA4D0Fina5/14CZ+s52iSzkmg23JA+yNOhfkbPOT OmYe/yy7tEN35KqS1oy7Ejg95oAXXtl9Gx/ZQcCLzEgiXLAT/EPBXdgoVtviHXETYclx HeOg== X-Gm-Message-State: AOAM530SUZlJSq1td/oNmWkSBzddybjsYgZKTNOG7/DwdSw8X+flMM7y bgzUHSxF7Syx9BAWKnpGzg3rYc0T8P0Vi3nh X-Received: by 2002:a05:620a:21c5:: with SMTP id h5mr23029980qka.395.1620756491577; Tue, 11 May 2021 11:08:11 -0700 (PDT) Received: from localhost.localdomain (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id g5sm17104476qtm.2.2021.05.11.11.08.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:08:11 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: robert.foss@linaro.org, andrey.konovalov@linaro.org, Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org (open list:QUALCOMM CAMERA SUBSYSTEM DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 04/17] media: camss: csid-170: fix non-10bit formats Date: Tue, 11 May 2021 14:07:11 -0400 Message-Id: <20210511180728.23781-5-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20210511180728.23781-1-jonathan@marek.ca> References: <20210511180728.23781-1-jonathan@marek.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the decode_format/data_type from the "format" struct instead of a hardcoded 10-bit format. Fixes: eebe6d00e9bf ("media: camss: Add support for CSID hardware version Titan 170") Signed-off-by: Jonathan Marek --- drivers/media/platform/qcom/camss/camss-csid-170.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c index ac22ff29d2a9..a81cc94c075f 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-170.c +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c @@ -366,7 +366,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val |= input_format->width & 0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH; writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_0(0)); - val = DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE; + val = format->data_type << TPG_DT_n_CFG_1_DATA_TYPE; writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_1(0)); val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE; @@ -382,8 +382,8 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) val = 1 << RDI_CFG0_BYTE_CNTR_EN; val |= 1 << RDI_CFG0_FORMAT_MEASURE_EN; val |= 1 << RDI_CFG0_TIMESTAMP_EN; - val |= DECODE_FORMAT_PAYLOAD_ONLY << RDI_CFG0_DECODE_FORMAT; - val |= DATA_TYPE_RAW_10BIT << RDI_CFG0_DATA_TYPE; + val |= format->decode_format << RDI_CFG0_DECODE_FORMAT; + val |= format->data_type << RDI_CFG0_DATA_TYPE; val |= vc << RDI_CFG0_VIRTUAL_CHANNEL; val |= dt_id << RDI_CFG0_DT_ID; writel_relaxed(val, csid->base + CSID_RDI_CFG0(0)); -- 2.26.1