From patchwork Mon Jan 13 09:53:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13937102 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 64E25E7719F for ; Mon, 13 Jan 2025 09:53:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D41410E606; Mon, 13 Jan 2025 09:53:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bYVDziEk"; dkim-atps=neutral Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA56610E603 for ; Mon, 13 Jan 2025 09:53:49 +0000 (UTC) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-540218726d5so3826409e87.2 for ; Mon, 13 Jan 2025 01:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736762028; x=1737366828; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pu+t3eGEK8ZKk4cbdeq2Wt6p9hR7Yq831BJnA041QI0=; b=bYVDziEkMWhfek4yU5bf+1G4vVIu3D8qOz73g6jA0fW0/LKz7MqHoHCHLKlYN1reKy +ALOJDmc2GCawSwclP/hxxPtsoc3WcAqY6amIG4UjG5nddxa2ZixKe4/l8DfbPKptafB 5cvsqEXi+SiYaxQ7gx02VEd7iuiIS4z9Jm/b2YN/5i2OKt4pjX7jRi5cDgu0a8Ryochs TMwqv6WBc9hw3d0MKv1DJpv9i54Zu3+po4EtUbPdio6qsHgF9s2NsAWrjGYvhIIi7+Wz JYwKtVmDsIMlFflJ5PZgGhaXKAsfRokC+RAKHM+zwY2UU1izeV28mc0/7jBnOIHoqIH8 M9sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736762028; x=1737366828; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pu+t3eGEK8ZKk4cbdeq2Wt6p9hR7Yq831BJnA041QI0=; b=BLq3A7fhymzWxT8HDbcCeOSMy5SPQWyRUACbZrTOq+u/lFygjox29qLTdeHQyfNbEl +Fr6QUUfYoEFmPq/2GFmXslgsmFE7XVSA8F5crqns8+WCRfn8GTyla3dXsYLz/oRp638 5qAQKgkWIzPKJlC7FDMj9/ztAs/zpnFICjYkpEx2LRaTftXp2OlWEifu9y2g1SsvokDI jsq17rlBPUa3KcwfJWGb/hMVfUc+nlw93oh6EVbJVV2nW3iakZq6qzxGOWwgwvDNOL17 MwJDfwHIpLOti0G3t54qFgd4PxqeCMEYuxQiEbPqtIpVit7gWXxJfMKBJBlS4dlXUFR6 GcXg== X-Forwarded-Encrypted: i=1; AJvYcCWiCjA0l54LGy6P/ABy9gl7DpysX+giv7Hr2kAgkx8szjuGyZrmoum0ofLaLRqCM1cC5e+U7vDk51M=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyoX+p0wEpzTEpz2IsKKb6uMquRXVfc/irRnRs1yXFt2wnun0ET he7Ac6tlKiU6x4wOB4x7RUrL4eqhXRHdjhiF096SqW/OirYsnvCoE9ObYeL5RvU= X-Gm-Gg: ASbGncu4n8n7jYFsOfDpHZiYuU9c7xHodEDRFFE6wl/q3og4UIdlMGiDqGj5x+YCwD4 0JHBoSbv+OXerDXiqWRotRBMUA4smNuZgf8Pn1wSFhaZmD9bSrxMa2N9GJnAGkOHi8kvfosNJCT vvDUnR6NWTMvMAhI1x98WSIAFk5MxJWME3fGXvBPRUpVDfYPh7umSWW6uWu+6ruznIw/VNM5WTR 1jTkXGqLeeZfNaLZtGekLc3k3Porr/WfLqKFsxVpA/d4a5CHMT/Aze8ppShKWQn X-Google-Smtp-Source: AGHT+IGyYsua+oSEuP0SJyrXE0+rZOjxnrGvxktSXWp88tTL5G6A6GO6/YM4oZ7l3TYHL2JM9UtLxA== X-Received: by 2002:a05:6512:3b9d:b0:542:6d01:f55f with SMTP id 2adb3069b0e04-5428481ceaamr6522362e87.48.1736762027923; Mon, 13 Jan 2025 01:53:47 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5428bea6a67sm1287085e87.167.2025.01.13.01.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2025 01:53:47 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 13 Jan 2025 11:53:44 +0200 Subject: [PATCH v3 1/3] drm/i2c: tda998x: drop support for platform_data MIME-Version: 1.0 Message-Id: <20250113-drm-move-tda998x-v3-1-214e0682a5e4@linaro.org> References: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> In-Reply-To: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Liviu Dudau , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Russell King , Hans Verkuil , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5039; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=ynoYEf8e255Bg4jgwwDTCT/Dnh62RtjqpzCFJ2/k3Vs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnhOKq+7t8TNgfGh825v8KqzGW6hDBCJjGIJUtt 6MkbRUdqOWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ4TiqgAKCRCLPIo+Aiko 1VonB/0ZfyIt5HcpNepYuB1zqHG3DQTe7QjNBrzkMoJ2Tj9sTZr/nVTqTW7bOzvnVpRk89YgbVV 2CUtU+Aez1UIMe94fBVA32wvlXipmPzSIv0DtoLHEepvuOwygjF0TN2RAY2mQsNJ6vpYACzDHau FES2Dar2JY4tZukZtN7NQmNjuc9ydnHU7B6giwyAQpY7cZuqzFPUkwbEiu83h2gs6t5i/6lPyHp LGTgl0us7w4HMnCd6pXVsRlWnuQG+JSFh+BgMlVeHorP5BFK7eaiG0/sXZy7UnZNjpFuRINrvtC 9U/HAl6K0rniWjdtoJgIDjh1jh5SjY5N4EIkE/KaWbq28apo X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" After the commit 0fb2970b4b6b ("drm/armada: remove non-component support") there are no remaining users of the struct tda998x_encoder_params. Drop the header and corresponding API from the TDA998x driver. Reviewed-by: Laurent Pinchart Signed-off-by: Dmitry Baryshkov --- MAINTAINERS | 1 - drivers/gpu/drm/i2c/tda998x_drv.c | 49 ++++----------------------------------- include/drm/i2c/tda998x.h | 40 -------------------------------- 3 files changed, 4 insertions(+), 86 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a3566163f1cbd583b8fdb7f2f18d5289263adc31..223eb6bfd0579768c246dcc51831048627fb8d02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17046,7 +17046,6 @@ S: Maintained T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes F: drivers/gpu/drm/i2c/tda998x_drv.c -F: include/drm/i2c/tda998x.h F: include/dt-bindings/display/tda998x.h K: "nxp,tda998x" diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 82d4a4e206a584e045a8fcd593fc12b7c1257bfe..ebc758c72891188e236d4da0cde283f108d80aca 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -21,10 +21,11 @@ #include #include #include -#include #include +#include + #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) enum { @@ -1717,10 +1718,10 @@ static int tda998x_get_audio_ports(struct tda998x_priv *priv, u8 ena_ap = be32_to_cpup(&port_data[2*i+1]); switch (afmt) { - case AFMT_I2S: + case TDA998x_I2S: route = AUDIO_ROUTE_I2S; break; - case AFMT_SPDIF: + case TDA998x_SPDIF: route = AUDIO_ROUTE_SPDIF; break; default: @@ -1746,44 +1747,6 @@ static int tda998x_get_audio_ports(struct tda998x_priv *priv, return 0; } -static int tda998x_set_config(struct tda998x_priv *priv, - const struct tda998x_encoder_params *p) -{ - priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) | - (p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) | - VIP_CNTRL_0_SWAP_B(p->swap_b) | - (p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0); - priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) | - (p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) | - VIP_CNTRL_1_SWAP_D(p->swap_d) | - (p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0); - priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) | - (p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) | - VIP_CNTRL_2_SWAP_F(p->swap_f) | - (p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0); - - if (p->audio_params.format != AFMT_UNUSED) { - unsigned int ratio, route; - bool spdif = p->audio_params.format == AFMT_SPDIF; - - route = AUDIO_ROUTE_I2S + spdif; - - priv->audio.route = &tda998x_audio_route[route]; - priv->audio.cea = p->audio_params.cea; - priv->audio.sample_rate = p->audio_params.sample_rate; - memcpy(priv->audio.status, p->audio_params.status, - min(sizeof(priv->audio.status), - sizeof(p->audio_params.status))); - priv->audio.ena_ap = p->audio_params.config; - priv->audio.i2s_format = I2S_FORMAT_PHILIPS; - - ratio = spdif ? 64 : p->audio_params.sample_width * 2; - return tda998x_derive_cts_n(priv, &priv->audio, ratio); - } - - return 0; -} - static void tda998x_destroy(struct device *dev) { struct tda998x_priv *priv = dev_get_drvdata(dev); @@ -1982,10 +1945,6 @@ static int tda998x_create(struct device *dev) if (priv->audio_port_enable[AUDIO_ROUTE_I2S] || priv->audio_port_enable[AUDIO_ROUTE_SPDIF]) tda998x_audio_codec_init(priv, &client->dev); - } else if (dev->platform_data) { - ret = tda998x_set_config(priv, dev->platform_data); - if (ret) - goto fail; } priv->bridge.funcs = &tda998x_bridge_funcs; diff --git a/include/drm/i2c/tda998x.h b/include/drm/i2c/tda998x.h deleted file mode 100644 index 3cb25ccbe5e68bf95ce13249f15549b7e2582281..0000000000000000000000000000000000000000 --- a/include/drm/i2c/tda998x.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __DRM_I2C_TDA998X_H__ -#define __DRM_I2C_TDA998X_H__ - -#include -#include - -enum { - AFMT_UNUSED = 0, - AFMT_SPDIF = TDA998x_SPDIF, - AFMT_I2S = TDA998x_I2S, -}; - -struct tda998x_audio_params { - u8 config; - u8 format; - unsigned sample_width; - unsigned sample_rate; - struct hdmi_audio_infoframe cea; - u8 status[5]; -}; - -struct tda998x_encoder_params { - u8 swap_b:3; - u8 mirr_b:1; - u8 swap_a:3; - u8 mirr_a:1; - u8 swap_d:3; - u8 mirr_d:1; - u8 swap_c:3; - u8 mirr_c:1; - u8 swap_f:3; - u8 mirr_f:1; - u8 swap_e:3; - u8 mirr_e:1; - - struct tda998x_audio_params audio_params; -}; - -#endif From patchwork Mon Jan 13 09:53:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13937104 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 6BF48C02181 for ; Mon, 13 Jan 2025 09:53:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 285B610E60B; Mon, 13 Jan 2025 09:53:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QJl5Vr5L"; dkim-atps=neutral Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B9C810E603 for ; Mon, 13 Jan 2025 09:53:51 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-540218726d5so3826441e87.2 for ; Mon, 13 Jan 2025 01:53:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736762029; x=1737366829; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oXs1vUKOp07Lh7MvZmn/kX1druV2/H8ljgw6d1TArsU=; b=QJl5Vr5LqxPvc9SJI0McU4YL/6sNKlraRJc3mowT7Bjk7WweqYnISUhLroZ4uYT6ra 31UrLftQwnMjp9QSdKQ0Kplyikhuxefquc+QpdjBTUDQMpxVAPtYo8awF61CbinoLKuQ deicIyt8pyBLZyFmBXqiB8SlxjPE17TSItHUzKEjYuTGikamPI11lyVLUxNpiiqSzbMB K4IITDSzCKCogy4pvtNRIHvsJG61lJ/k9eVId903e4gdRntAfHVVkQNUwHoQ6P6U76g8 Tk1Wq23dWM0Iy1V6xu51kTtAlJHm3Lq8IYBS3sAlmUjYLFwIEKa8GhFPDQ0IDsfNAwh0 OnSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736762029; x=1737366829; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oXs1vUKOp07Lh7MvZmn/kX1druV2/H8ljgw6d1TArsU=; b=ijHRNLjavm/6ugvYzrtAtyKMYin7WvSGoXq1hNCM9Ec4w6Eet+T1IzCtkBoii/sbKX YsQ0bqSANRuBMx89uU/5oGWtEzWqDgx989kQNvVx6bTrEwsNinXHn3HARpmwp5nsvecl v4sGX10mrZcwqdcxa8Q+UdmO74mOj4Ght4fyfw4TjlfARxbn3k3wckY2B0tu27sYBgJ5 XwTbCwOcney/QXDU9nuy0qyE6F2vze+gr5OTl9y1AAG4WSa7Qfi2kiyNJq8dOLK6hsvN ILUXNqdFrsBzRubR3nf9nffDkIsL6PSL3T9JguDooA7CKLrUjvPiG9QwccIFiUOEFSlu i83g== X-Forwarded-Encrypted: i=1; AJvYcCV9Af/qFmx+AqTg23hoBDgdBysPefSHY7ADK7f97nVIYebPZwmYCF7JfR0SbaZYmbGYZWn/KTk6ggY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwIYaidYWQh1+NSGhCYZSAFZ58d3HGzxj9uYZwuNaVOBkmpHKVz AU1kC0+3FxRXDcVGsz49AWtQJD+Hzf/tibsjiv5XEDeWnMNZyr+iA22Ydvfe6gg= X-Gm-Gg: ASbGnctHT7xzZx1V/aqo6K7r0CAqeWQqtIjsqXRCaJ4E2wOboR7+zJyJUJnscKNU/FY yEQlIobF4Y2BTMDHCMH4ADl/aj0qTFTjqBGaaz27DCb/Bn/NurqTJllGmTrvyg/vZqabl5rCj+7 Uo5nr5Pu4rEI5rcEXh1o9eM2S1ZxpnViAPAvYJN0EgvR7qyO+AhG1cg+enOgDjn1sCHeL3uzFoY k4vT0kJygSwwdKwbXWcoIRaXH/uq+fgJNVTb8qtTn+5CfagoK/vUJpwxHIWpt/W X-Google-Smtp-Source: AGHT+IF+h31WfsFmobpodKgDnSta6YnhkeQaVEHS4krRz0FXT9qy9HA9r3wcFLj2hsHiFB0Tc/xx2Q== X-Received: by 2002:a05:6512:3ba8:b0:540:1f7d:8bc0 with SMTP id 2adb3069b0e04-5428481d028mr6641931e87.49.1736762029457; Mon, 13 Jan 2025 01:53:49 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5428bea6a67sm1287085e87.167.2025.01.13.01.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2025 01:53:48 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 13 Jan 2025 11:53:45 +0200 Subject: [PATCH v3 2/3] media: cec: move driver for TDA9950 from drm/i2c MIME-Version: 1.0 Message-Id: <20250113-drm-move-tda998x-v3-2-214e0682a5e4@linaro.org> References: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> In-Reply-To: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Liviu Dudau , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Russell King , Hans Verkuil , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2981; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=18CnAyxjLuzT65z1y3huWbOQwdYExGvyWFR+pnRfSqM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnhOKqiJ4twX8bcD10UooMtxQ99Ns/x9mvJ+v2v Kzz8MW494aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ4TiqgAKCRCLPIo+Aiko 1b9UB/4n5SnoZc7cCIp92otesK+Heqeq+wluKL7rk4XbgQ9hQwSjrtqgB09Y67E5tndPI0qZHI8 vU7O7F4YptLo/rQDV4LMK8ZLnDHgGhMw8YpwzbtarzBxXJa3lBzSouVliNzvjIo4osZ/6tizyIa K8SrAsGisdsilo183vplQN1/5pSgRdagFEpmjbdGRfOGrozfFkOwU+L/uvQiIusA+cdUIpXaMXz qE83C/yL/1s/Y/IxnK3MtlFbLBNrgqdVzbC9Dh+5r9XHghE5oOYnxF97nT3RK+0b8vZYRF226EQ RJB39Bn0wbRytlwLEGdHo7FYKmG/qJwDiFVFlXDvFRS2vDl8 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move the driver for NXP TDA9950 / CEC part of TDA998x together to drivers/media/i2c, close to other CEC drivers. Specify 'default DRM_I2C_NXP_TDA998X' in order to simplify migration from old config files as the Kconfig name has been changed to follow media/cec style. Acked-by: Hans Verkuil Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/i2c/Kconfig | 5 ----- drivers/gpu/drm/i2c/Makefile | 1 - drivers/media/cec/i2c/Kconfig | 9 +++++++++ drivers/media/cec/i2c/Makefile | 1 + drivers/{gpu/drm => media/cec}/i2c/tda9950.c | 0 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i2c/Kconfig b/drivers/gpu/drm/i2c/Kconfig index d5200f67958e68a8ec73401f1d3b79cbe0aa303d..1aa2a0bf5cc183b4ce92fc4f7eb61fd0065250d1 100644 --- a/drivers/gpu/drm/i2c/Kconfig +++ b/drivers/gpu/drm/i2c/Kconfig @@ -10,9 +10,4 @@ config DRM_I2C_NXP_TDA998X help Support for NXP Semiconductors TDA998X HDMI encoders. -config DRM_I2C_NXP_TDA9950 - tristate "NXP Semiconductors TDA9950/TDA998X HDMI CEC" - select CEC_NOTIFIER - select CEC_CORE - endmenu diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile index 31fd35527d99d7eb23851d290175a3ff0c756772..45791fbfae983eecf58565109cf8eecb6431643b 100644 --- a/drivers/gpu/drm/i2c/Makefile +++ b/drivers/gpu/drm/i2c/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 tda998x-y := tda998x_drv.o obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o -obj-$(CONFIG_DRM_I2C_NXP_TDA9950) += tda9950.o diff --git a/drivers/media/cec/i2c/Kconfig b/drivers/media/cec/i2c/Kconfig index d912d143fb3129c6b3d0133dbfceffdd48bd543d..b9d21643eef1892ccff508b1864db30e83570212 100644 --- a/drivers/media/cec/i2c/Kconfig +++ b/drivers/media/cec/i2c/Kconfig @@ -13,3 +13,12 @@ config CEC_CH7322 generic CEC framework interface. CEC bus is present in the HDMI connector and enables communication between compatible devices. + +config CEC_NXP_TDA9950 + tristate "NXP Semiconductors TDA9950/TDA998X HDMI CEC" + select CEC_NOTIFIER + select CEC_CORE + default DRM_I2C_NXP_TDA998X + help + This is a driver for the NXP TDA9950 CEC controller and for the CEC + controller block integrated into several NXP TDA998x HDMI encoders. diff --git a/drivers/media/cec/i2c/Makefile b/drivers/media/cec/i2c/Makefile index d7496dfd0fa49631299ff56c20e946757e50cdb2..95c9eda5258361c4d9196acb527e0c1b4351dbe0 100644 --- a/drivers/media/cec/i2c/Makefile +++ b/drivers/media/cec/i2c/Makefile @@ -3,3 +3,4 @@ # Makefile for the CEC I2C device drivers. # obj-$(CONFIG_CEC_CH7322) += ch7322.o +obj-$(CONFIG_CEC_NXP_TDA9950) += tda9950.o diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/media/cec/i2c/tda9950.c similarity index 100% rename from drivers/gpu/drm/i2c/tda9950.c rename to drivers/media/cec/i2c/tda9950.c From patchwork Mon Jan 13 09:53:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13937103 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 DA9B0E7719E for ; Mon, 13 Jan 2025 09:53:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F20E610E607; Mon, 13 Jan 2025 09:53:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="LJWBsjiP"; dkim-atps=neutral Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC72210E607 for ; Mon, 13 Jan 2025 09:53:52 +0000 (UTC) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5401c68b89eso4434057e87.0 for ; Mon, 13 Jan 2025 01:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736762031; x=1737366831; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tYam0PHNUR63LLlWlH1Vtdfw12t5C9h1Tb67zYZaKyw=; b=LJWBsjiP9vIa7qAC7+7oQd2wSV8Vx4UfffpL8y3P4HjDDa/HfGzRonHhOJVXzQiV7F z39jv+cCJCsXnSeciSaZ2Ib/ma/fnA+1mcEJOW0WFjCu07CSDpBAzZxAl9vmqlygLkwb CxRdc1YuNtlw8WNukJxa0S8dMdy9kU22e9+jFWOyGPfnAkhbsvSDU1jyvFduT86On1Za l7YiXUmdk4BdToO8IqXyag+nufpWZrCKoiLyz5eC/+tGB6OHMx6AVhIFFZ41kjIWezVn xbU5zj3xIe+eX/sVZoC0xdmPvg8EkIFvleVq7TNklJNxxTit5ZqeFE3UvmOzAMqU18wQ YdhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736762031; x=1737366831; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tYam0PHNUR63LLlWlH1Vtdfw12t5C9h1Tb67zYZaKyw=; b=TN1nAkNTfsqWaoACy1TRwmg0HLA6G9cLox9WQyHnZwKuGjR3xGWq3Pej4kFQ8kyIzt rzxPEaqrqcsVpAIgtsB4cpOppn2NenCkYEkCpZ0l0hQ4SdcMVyM2zFBJlnodsg3cZ6Je TCDxVHK5bFigld365aqOjJD/R3hOUCDjQIu8F1m14a87uVV8e63TsQc3REPXECLajwn5 fFQJs/IG+PshzCHNjUp/nh/UWeSsR0Xc3DUb7Vb4kWgQjIjiewuSo3wBS+aDmQDTBa7H VHd40mVBeOeq1oOXJ3p7mGKtFZcmjT0sKhxWJxrDDm77OfKPGlhvwXDlUbXrckoxjBNi x79A== X-Forwarded-Encrypted: i=1; AJvYcCUOQ3KVUay294PUQOt3ofbIxB3sYEkVLHG0VoOFDXzXWcxS4UDpoVM/60NE1Ql8kp7RT5dfTw2K0os=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxlAd5ymdWrvUKxs5xAc3II0tDZ6que8RPCLd6swjdzKc6oy5UO eVAqjzgcG3CxHXbR0Bieo4ViUrsNgVhYo/g/FGNrc9GT3acvqN7Vqk4KWk3Eo2I= X-Gm-Gg: ASbGnctmGfsgwp3SBpnfhTqkBWTH/EGwyN/O1/NRDNzfE+c7bDK11MbS+dOKYie2u7Y eKIdB7je4WYa8Hbzo0uSi3RCzdQBrKsvp4szdEWesXMXFrQ3tN+J8qjoNEPNE/e7uJsl3tiDWO9 z4U+a0g4bIdvI3EzUM/UZ41MgZ8r31bCIzYokb7+a2igp9TU4NHPuTeh7YTGw9km8iUWXBsE55y OPqd0k+HJK52gQXMyHu3nGaQ+0T3MKtkAysFDmd9y6sGQlNhqKaXtcWBEORv4AQ X-Google-Smtp-Source: AGHT+IEgZgMT6aGcz1FkeuACFwbNLj4TxthV4kSPiuMJ/6t2E3WuFNbC0Qw+Px78twvyB2hiXv5GzQ== X-Received: by 2002:a05:6512:318b:b0:542:23b2:8010 with SMTP id 2adb3069b0e04-5428a68a3e5mr4531967e87.23.1736762031085; Mon, 13 Jan 2025 01:53:51 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5428bea6a67sm1287085e87.167.2025.01.13.01.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2025 01:53:49 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 13 Jan 2025 11:53:46 +0200 Subject: [PATCH v3 3/3] drm/i2c: move TDA998x driver under drivers/gpu/drm/bridge MIME-Version: 1.0 Message-Id: <20250113-drm-move-tda998x-v3-3-214e0682a5e4@linaro.org> References: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> In-Reply-To: <20250113-drm-move-tda998x-v3-0-214e0682a5e4@linaro.org> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Liviu Dudau , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Russell King , Hans Verkuil , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4689; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=Ic17kfBFEswigerUPPyAWbVpLAW5I7CJRGIoF3f2Cz4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnhOKqewzGoygP5cg0eoYvM91fAPhTv299hcS1p OK4U+10NraJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ4TiqgAKCRCLPIo+Aiko 1ZINCACp1RNdlKNHD1se30iTWT5n30rRxiyxYCZcqKUjC5TLJQ5gmkz2sv+HltGnP/RxTLTdp41 0WvWsU9C0PO7X/KXxRUzP1A7Dzwll13s0kxmMDJf1+tbBMQgiLBKqbeZNSjKgIeTzZAQg5+v94n MSiG2ONdyWD0JY/dxl3rSRWCLNRZnE9J7mCnXoe7LRtBDBF+vL7j4sVkKenzUbB4dbXixGaqdz5 JLtz6MEnjtW7susXlaSx+L6bHYP7SPIfuzCfs6WnHn+QqKMFG7byaSskl5rEL4LWOvbHU7E3lpx K69eJ4UwN9AlE3ZYk3oeWu82lrvS/ESmhG2XKt9FoLalcI93 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" TDA998x is the HDMI bridge driver, incorporating drm_connector and optional drm_encoder (created via the component bind API by the TICLDC and HDLCD drivers). Thus it should be residing together with the other DRM bridge drivers under drivers/gpu/drm/bridge/. Acked-by: Neil Armstrong Acked-by: Liviu Dudau Reviewed-by: Laurent Pinchart Signed-off-by: Dmitry Baryshkov --- MAINTAINERS | 2 +- drivers/gpu/drm/arm/Kconfig | 1 + drivers/gpu/drm/bridge/Kconfig | 8 ++++++++ drivers/gpu/drm/bridge/Makefile | 4 ++++ drivers/gpu/drm/{i2c => bridge}/tda998x_drv.c | 0 drivers/gpu/drm/i2c/Kconfig | 13 ------------- drivers/gpu/drm/i2c/Makefile | 3 --- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 223eb6bfd0579768c246dcc51831048627fb8d02..7a15fb49c2905dcba7bc08f03abe12bd7f493f84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17045,7 +17045,7 @@ M: Russell King S: Maintained T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes -F: drivers/gpu/drm/i2c/tda998x_drv.c +F: drivers/gpu/drm/bridge/tda998x_drv.c F: include/dt-bindings/display/tda998x.h K: "nxp,tda998x" diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig index c901ac00c0c3a8f356bd53d97305c6b39b3e6662..ed3ed617c6884876368c8bd072c53f1b710df443 100644 --- a/drivers/gpu/drm/arm/Kconfig +++ b/drivers/gpu/drm/arm/Kconfig @@ -9,6 +9,7 @@ config DRM_HDLCD select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER + select DRM_BRIDGE # for TDA998x help Choose this option if you have an ARM High Definition Colour LCD controller. diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 6b4664d91faa80f096ac6a0548ed342e802ae68b..d20f1646dac27898ecb7599a9a06663357dcca14 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -90,6 +90,14 @@ config DRM_FSL_LDB help Support for i.MX8MP DPI-to-LVDS on-SoC encoder. +config DRM_I2C_NXP_TDA998X + tristate "NXP Semiconductors TDA998X HDMI encoder" + default m if DRM_TILCDC + select CEC_CORE if CEC_NOTIFIER + select SND_SOC_HDMI_CODEC if SND_SOC + help + Support for NXP Semiconductors TDA998X HDMI encoders. + config DRM_ITE_IT6263 tristate "ITE IT6263 LVDS/HDMI bridge" depends on OF diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 97304b429a530c108dcbff906965cda091b0a7a2..245e8a27e3fc525ffe02103e4436c71313f55d9a 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -6,6 +6,10 @@ obj-$(CONFIG_DRM_CHRONTEL_CH7033) += chrontel-ch7033.o obj-$(CONFIG_DRM_CROS_EC_ANX7688) += cros-ec-anx7688.o obj-$(CONFIG_DRM_DISPLAY_CONNECTOR) += display-connector.o obj-$(CONFIG_DRM_FSL_LDB) += fsl-ldb.o + +tda998x-y := tda998x_drv.o +obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o + obj-$(CONFIG_DRM_ITE_IT6263) += ite-it6263.o obj-$(CONFIG_DRM_ITE_IT6505) += ite-it6505.o obj-$(CONFIG_DRM_LONTIUM_LT8912B) += lontium-lt8912b.o diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/bridge/tda998x_drv.c similarity index 100% rename from drivers/gpu/drm/i2c/tda998x_drv.c rename to drivers/gpu/drm/bridge/tda998x_drv.c diff --git a/drivers/gpu/drm/i2c/Kconfig b/drivers/gpu/drm/i2c/Kconfig deleted file mode 100644 index 1aa2a0bf5cc183b4ce92fc4f7eb61fd0065250d1..0000000000000000000000000000000000000000 --- a/drivers/gpu/drm/i2c/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menu "I2C encoder or helper chips" - depends on DRM && DRM_KMS_HELPER && I2C - -config DRM_I2C_NXP_TDA998X - tristate "NXP Semiconductors TDA998X HDMI encoder" - default m if DRM_TILCDC - select CEC_CORE if CEC_NOTIFIER - select SND_SOC_HDMI_CODEC if SND_SOC - help - Support for NXP Semiconductors TDA998X HDMI encoders. - -endmenu diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile deleted file mode 100644 index 45791fbfae983eecf58565109cf8eecb6431643b..0000000000000000000000000000000000000000 --- a/drivers/gpu/drm/i2c/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -tda998x-y := tda998x_drv.o -obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o