From patchwork Tue Apr 13 10:57:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 12200179 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 4E277C43460 for ; Tue, 13 Apr 2021 11:12:12 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 C9216613A9 for ; Tue, 13 Apr 2021 11:12:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9216613A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=zML2SQQrokKc+bAKq8acUKkB9wb/EYannaWHhBZSles=; b=DmoKO+5+DobG/6jH+PaPNqBep oMrODZulT90+uH4DXzIpHo4TCy2ikw86fuf1rIwbhK7DmYXezqKiM8f/w6uhkHXNybtIAD18OVxoZ UxIIZTkC0K0UDXMKCmrm/v4cykIJsxe7Zu9j3dEdSkeZ9RTZ836ViojP3XkxnBs0GP8RNZoAUa8aT px6JHs72f+l7n0ZQjmZU9nTggz55salCLQePsiXAg6TChqZefYebUwNyyxYWce8LSO+KhZYnV75jU 23PHd6rIyVFhPMgvB/xgf3f9lx1Hf9I5/HGsVyxchkZPIRZRROFYUdLiMeHtB+DYmfDToujvZD5M3 m9Kf/2erA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lWGvR-008xyr-Ka; Tue, 13 Apr 2021 11:09:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWGnh-008wSr-UF for linux-arm-kernel@desiato.infradead.org; Tue, 13 Apr 2021 11:01:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Sender:Reply-To:Content-ID:Content-Description; bh=ibudViyz/omvv6id6lN8Uvm/eRgAXXZJ8SsBybhEmEo=; b=GH1uOseOwgTT2QODJfPuNPhhX+ raLXD8W+CoIqNX5sldHMvSFCR4zsWYh915ndX1Uz3oaToZCUq5auymb8s1VTODDKTKbh1T/NG0HIR 4sYS4UzwrAUmqbIDyvBMfVZ690Ykgmt4JI3+u7ZwUWCibfJ7LnC9xdYQf1Ywx12uMfsHsw3Tbuabf 9hR+koTpxey0syRlwt09BjQScT5sr6VX60p3aB/9sWYtph5G9BcdYPz6guTt6XAyBYrr/J/c48rgv 7FXXUtuay58hrMjofCwhu0uxXvqV5uWjIKiExDUREDxnVOn2ktMuFfZxs0AU3X+kYmItWm5Dpti/A 2H6uIiWw==; Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWGnf-006wly-CN for linux-arm-kernel@lists.infradead.org; Tue, 13 Apr 2021 11:01:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1618311703; x=1649847703; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mWUF5WO+LMK2zinnvrhdZoL9RLmN49w72UCDrsLSB14=; b=DfWxmzCIQP8j5Y+mikpDSLt7i35votbez+wtFNy7x2JsKCn7FcbhFupk wDps4giwMfUsbopL12dkLtxXkEwV8pgGqXqFu0toBkpuZNT7HLQQHJbEe tWqGa/Ylt8q1Kh71Rh0bed3c5mQsy63uqlLnkUPolHvwe14D27jcMPL5M bmxN/nHhUtyi/WwoxtE6VeT0xZBim14VS/WSkfcFdKVl5EUyY/h02da1s /osz6nJSHMre6k1ZabpSwaESiWCEHAjKhT8P56yVG7CIvATrEyw8MgGo8 ab4udnEZI4KzLlnXawcltLg5uLcPbGZqjVJnFuGqWz9wUaMedfIH/6aiw Q==; IronPort-SDR: 66XRoqAIivml1EHE8Ye8EGHwXxdmrn+ipueOlTrVTc37gKHn3FZOEcbeyX9tJaqaKWakHLhmGR ekNaOJqcjRhk9Uka2a17ElVsOnPYZ9c0tPYYv/fjcXX5pB2Ptohveo36KCTxJIV1X+spZR/xJ3 TEFWWrVew9RxvJkUww2bxstoHum4zSc92Qi874IyG5ic/bfGfx4GVCusQdXgEdN/M62Tw5rTgM wiL3z3PBfyEZ+gL/t3KSpwVJHDJD6Z5hMj/VdX7kiC0mfEnOIn7Q0tsb8nsmpmmsUrMMbR/0zh s5o= X-IronPort-AV: E=Sophos;i="5.82,219,1613458800"; d="scan'208";a="110611909" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Apr 2021 04:01:41 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 13 Apr 2021 04:01:29 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Tue, 13 Apr 2021 04:01:23 -0700 From: Eugen Hristev To: , , , CC: , , Eugen Hristev Subject: [PATCH v3 12/33] media: atmel: atmel-isc: add RLP to register offsets Date: Tue, 13 Apr 2021 13:57:10 +0300 Message-ID: <20210413105731.610028-13-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210413105731.610028-1-eugen.hristev@microchip.com> References: <20210413105731.610028-1-eugen.hristev@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210413_040143_509273_12F20934 X-CRM114-Status: GOOD ( 14.74 ) 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 The RLP submodule is a part of the atmel-isc pipeline, and stands for Rounding,Limiting and Packaging. It used to extract specific data from the ISC pipeline. For example if we want to output greyscale 8 bit, we would use limiting to 8 bits, and packaging to Luma component only. Add rlp to the reg offsets struct. This will allow different products to have a different reg offset for this particular module. Signed-off-by: Eugen Hristev --- Changes in v3: - add module description in commit message drivers/media/platform/atmel/atmel-isc-base.c | 4 ++-- drivers/media/platform/atmel/atmel-isc-regs.h | 2 ++ drivers/media/platform/atmel/atmel-isc.h | 2 ++ drivers/media/platform/atmel/atmel-sama5d2-isc.c | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c index b2067d75499b..317172959370 100644 --- a/drivers/media/platform/atmel/atmel-isc-base.c +++ b/drivers/media/platform/atmel/atmel-isc-base.c @@ -718,8 +718,8 @@ static int isc_configure(struct isc_device *isc) regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0); - regmap_update_bits(regmap, ISC_RLP_CFG, ISC_RLP_CFG_MODE_MASK, - rlp_mode); + regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp, + ISC_RLP_CFG_MODE_MASK, rlp_mode); regmap_write(regmap, ISC_DCFG, dcfg); diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h index 04839def6ef6..2205484e04fc 100644 --- a/drivers/media/platform/atmel/atmel-isc-regs.h +++ b/drivers/media/platform/atmel/atmel-isc-regs.h @@ -204,6 +204,8 @@ /* Subsampling 4:2:2 to 4:2:0 Control Register */ #define ISC_SUB420_CTRL 0x000003cc +/* Offset for RLP register specific to sama5d2 product */ +#define ISC_SAMA5D2_RLP_OFFSET 0 /* Rounding, Limiting and Packing Configuration Register */ #define ISC_RLP_CFG 0x000003d0 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h index fb7257872e7c..b7d4e7fab570 100644 --- a/drivers/media/platform/atmel/atmel-isc.h +++ b/drivers/media/platform/atmel/atmel-isc.h @@ -150,12 +150,14 @@ struct isc_ctrls { * @cbc: Offset for the CBC register * @sub422: Offset for the SUB422 register * @sub420: Offset for the SUB420 register + * @rlp: Offset for the RLP register */ struct isc_reg_offsets { u32 csc; u32 cbc; u32 sub422; u32 sub420; + u32 rlp; }; /* diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c index 943793fbc791..dd3f8e50a8d4 100644 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c @@ -237,6 +237,7 @@ static int atmel_isc_probe(struct platform_device *pdev) isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET; isc->offsets.sub422 = ISC_SAMA5D2_SUB422_OFFSET; isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET; + isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET; /* sama5d2-isc - 8 bits per beat */ isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;