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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 440F5CCA476 for ; Sat, 11 Oct 2025 17:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e7FprWKfv6NkWU+IK5Uxmm4Vashq7YlDd7qRaerBYZ0=; b=jVYldSafyALx2wevhEiCR8d8nS jnwHsDLB/XeWp+9BN/5P2+2yuOdAnWhYStjbilijfR5ns+RpHlK8ppS8613k7Uo2oWawBusSmPhww Vg5zBagj6mr/HAJMawUofqyzuNCgyhW5g+WnHAsNIUo1gd1x+pyHrxjvMirk6exz4QmQRW/eGfxYI KzLUt2huj2GmQLTji6Khwu3yqAKESxoLnS5/Eun2mS0g1t14+VcgPy1H5/b7bNjf2BZWAHqdH1F7/ 8EWnRpcQeKINXZCxGAJCDJhwjSNY19J3KJF7PbFQkln+uatjjea6wLQ474asUoywJO/Q5invJ9WLQ SpmKG4vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d0C-0000000ANAS-0af7; Sat, 11 Oct 2025 17:03:28 +0000 Received: from mout-p-202.mailbox.org ([2001:67c:2050:0:465::202]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d07-0000000AN2p-18Z0 for linux-arm-kernel@lists.infradead.org; Sat, 11 Oct 2025 17:03:26 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4ckVLK1BZFz9t1g; Sat, 11 Oct 2025 19:03:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e7FprWKfv6NkWU+IK5Uxmm4Vashq7YlDd7qRaerBYZ0=; b=EqO43FLIInxWNkEbVnpAiT1ydZCdg6oZs6hgx7w6QYAXbmoZEkEMgU9UNh9lDGVIy8MJaz WJ4WOmOkKGmjk7/HudAIJ59sXv4a0FgE2Lb+iU6VIA/azkO6PKjDx0Vj8h+5gRD1Fopyhc iWN05KQreCW1sjNoLN+enQYuArepaeYswBG7sPSHXCErGIUoQcJRCs+5GtVBTLfJontU+w qAYbpRdUT5EGOjrj9B7QD/wcW2MLeuu8Zsp7+S5iGpzzJDAoORbBGwCu603ixtbxr2LzGw BNJmw7hUSB1vTun9yVgQAHqB0sDHD50l3ny4+5Frn8qxGfFbwbakq9TJmEJuuQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e7FprWKfv6NkWU+IK5Uxmm4Vashq7YlDd7qRaerBYZ0=; b=ZVePI4yqMI2W73BIo3FtxrWwvwsPzc+3ugiu6fIcaiEitjMfGcHDLh/9tlfRGjsB7y3tau 2KmFdS8fdekouOiqiJ5nOoi9ud3IbGz9j4UWn35LnWTvQ+8DSCwE3DSg++4lbhCobYdQlP yOp+//fRrME8zlCIrc9+7AqmZKjSddysxDqhPEBDq8CD8q2Xdbe0EhOzvR8VnF4bq4CIxd CVQLelFnmFGt7ctWP2rkh3qAvbQ6DUWj3Rg7IyFXdxctvIcbPcivm+ffTwL0A2TbsirmM1 qsaXYuklJ1UaywhQ0a5M7Om7XK2A9rG4HXQK8lhgQQ81VjhLQqPOppeorSk1OQ== To: dri-devel@lists.freedesktop.org Cc: Marek Vasut , Abel Vesa , Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Laurent Pinchart , Liu Ying , Lucas Stach , Peng Fan , Pengutronix Kernel Team , Rob Herring , Shawn Guo , Thomas Zimmermann , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH 10/39] drm/imx: dc: ed: Pass struct dc_ed_subdev_match_data via OF match data Date: Sat, 11 Oct 2025 18:51:25 +0200 Message-ID: <20251011170213.128907-11-marek.vasut@mailbox.org> In-Reply-To: <20251011170213.128907-1-marek.vasut@mailbox.org> References: <20251011170213.128907-1-marek.vasut@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: c3a95c61710d4cd17b4 X-MBO-RS-META: bktexf8x8epk3i57k5rwy1upm9qr7yzm X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251011_100323_478496_7E6A4418 X-CRM114-Status: GOOD ( 18.59 ) 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 Introduce struct dc_ed_subdev_match_data which describes the differences between i.MX8QXP and i.MX95, which in this case is src_sels mapping and address space offsets, and pass it as OF match data into the driver, so the driver can use the match data to apply correct src_sels value to the IP registers on each SoC. This is a preparatory patch for i.MX95 addition. No functional change. Signed-off-by: Marek Vasut --- Cc: Abel Vesa Cc: Conor Dooley Cc: Fabio Estevam Cc: Krzysztof Kozlowski Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Peng Fan Cc: Pengutronix Kernel Team Cc: Rob Herring Cc: Shawn Guo Cc: Thomas Zimmermann Cc: devicetree@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: imx@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org --- drivers/gpu/drm/imx/dc/dc-ed.c | 24 +++++++++++++++++++----- drivers/gpu/drm/imx/dc/dc-pe.h | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/imx/dc/dc-ed.c b/drivers/gpu/drm/imx/dc/dc-ed.c index 2fdd22a903dec..63dcad30ecced 100644 --- a/drivers/gpu/drm/imx/dc/dc-ed.c +++ b/drivers/gpu/drm/imx/dc/dc-ed.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "dc-drv.h" @@ -35,7 +36,12 @@ #define CONTROL 0xc #define GAMMAAPPLYENABLE BIT(0) -static const struct dc_subdev_info dc_ed_info[] = { +struct dc_ed_subdev_match_data { + const enum dc_link_id *src_sels; + const struct dc_subdev_info *info; +}; + +static const struct dc_subdev_info dc_ed_info_imx8qxp[] = { { .reg_start = 0x56180980, .id = 0, }, { .reg_start = 0x56180a00, .id = 1, }, { .reg_start = 0x561809c0, .id = 4, }, @@ -106,7 +112,7 @@ static const struct regmap_config dc_ed_cfg_regmap_config = { .max_register = CONTROL, }; -static const enum dc_link_id src_sels[] = { +static const enum dc_link_id src_sels_imx8qxp[] = { LINK_ID_NONE, LINK_ID_CONSTFRAME0, LINK_ID_CONSTFRAME1, @@ -119,6 +125,11 @@ static const enum dc_link_id src_sels[] = { LINK_ID_LAST /* sentinel */ }; +static const struct dc_ed_subdev_match_data dc_ed_match_data_imx8qxp = { + .src_sels = src_sels_imx8qxp, + .info = dc_ed_info_imx8qxp, +}; + static inline void dc_ed_pec_enable_shden(struct dc_ed *ed) { regmap_write_bits(ed->reg_pec, PIXENGCFG_STATIC, SHDEN, SHDEN); @@ -144,8 +155,8 @@ void dc_ed_pec_src_sel(struct dc_ed *ed, enum dc_link_id src) { int i = 0; - while (src_sels[i] != LINK_ID_LAST) { - if (src_sels[i++] == src) { + while (ed->src_sels[i] != LINK_ID_LAST) { + if (ed->src_sels[i++] == src) { regmap_write(ed->reg_pec, PIXENGCFG_DYNAMIC, src); return; } @@ -192,6 +203,8 @@ void dc_ed_init(struct dc_ed *ed) static int dc_ed_bind(struct device *dev, struct device *master, void *data) { + const struct dc_ed_subdev_match_data *dc_ed_match_data = device_get_match_data(dev); + const struct dc_subdev_info *dc_ed_info = dc_ed_match_data->info; struct platform_device *pdev = to_platform_device(dev); struct dc_drm_device *dc_drm = data; struct resource *res_pec; @@ -227,6 +240,7 @@ static int dc_ed_bind(struct device *dev, struct device *master, void *data) return ed->irq_shdload; ed->dev = dev; + ed->src_sels = dc_ed_match_data->src_sels; id = dc_subdev_get_id(dc_ed_info, res_pec); if (id < 0) { @@ -274,7 +288,7 @@ static void dc_ed_remove(struct platform_device *pdev) } static const struct of_device_id dc_ed_dt_ids[] = { - { .compatible = "fsl,imx8qxp-dc-extdst" }, + { .compatible = "fsl,imx8qxp-dc-extdst", .data = &dc_ed_match_data_imx8qxp }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, dc_ed_dt_ids); diff --git a/drivers/gpu/drm/imx/dc/dc-pe.h b/drivers/gpu/drm/imx/dc/dc-pe.h index 1e1e04cc39d4b..7928f947b0cef 100644 --- a/drivers/gpu/drm/imx/dc/dc-pe.h +++ b/drivers/gpu/drm/imx/dc/dc-pe.h @@ -56,6 +56,7 @@ struct dc_ed { struct regmap *reg_pec; struct regmap *reg_cfg; int irq_shdload; + const enum dc_link_id *src_sels; }; struct dc_lb { -- 2.51.0