From nobody Wed Dec 17 17:58:38 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E07011FDA6D for ; Mon, 13 Jan 2025 09:53:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762031; cv=none; b=cNIvbxgCCVhDcH+WMB1NtRSek2Tje/fJDkuZbeyPvxeq5F5LqbWWSbJbZ0BXSqZWvdE/ifvo2lINaErImJVEKVZ3Zm1dyXjv821d7RoLZ+6Ypf9oncXAcbhxd1ZCjsXzTmJ77UWEf2lYP03FbKbX/3UNk7zbYouS+V0/ntDC6Po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762031; c=relaxed/simple; bh=ynoYEf8e255Bg4jgwwDTCT/Dnh62RtjqpzCFJ2/k3Vs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OKJFVEGOKqFqkhnSXQg+E9d6H9XR1D0lWBOzuWJkO89bNk7I5bSjx+O7ZQnMuHG3ChOZtv2t85h2ETh+hmvG3v3M8VzZ+W0Emf5/gccBqnpJtq7EJP+99Rj5hENpEEg8Q+LE2uOpUMygmfca521aS5KHfq+Bs7hsAXNQYlqlUbA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=KnSwKa5Q; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KnSwKa5Q" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-540218726d5so3826405e87.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=vger.kernel.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=KnSwKa5QGKUqwrfgeO3MA7Y+Pf+Iuz1mIguJoV0EdHQhTgKeVivosvAsQ0qxF/t2gR yOMiNKXGZku1QnwqBqKAoRqEC1pflz9AGoEagX6lOKzg07g31aOtp9OXSyUSv/ZOWEh0 NGUg1sZomJQS7xeB2lo9oNtxihhsi/RUMpPoG50SFd6RY/RUyzgSb26T3vDBGPS9PkW6 DQ3N++kTHrLJ3barbH2C0UgKfoxX6gVLaD4umX+GhSLwNccsAyLazcuwlqaYY4wps/u/ 1guRfN+0OMq2MKkOeFLiTj4JgFrEuoL+G//6oTtpWbP5zFSfwa8Gdi1dO+40nfj9wzG0 eIsg== 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=sH67s9Ltl/e9TS0Ga05cQ2hQ9KrL2PgI/PBneLMogQOcaMO7T0HVI+jtsGnuo/uEWz 7MbsZhOATB6PWtrg8YzXDQRxBgga1yyKE9sKfSRPxe4jzx1XxP7o85ZRPt5NEF4LdfbT 4qF1QyhImlAHG/ke0SYE8kIVloZJOdB9olNojcLU7gc5cehbKFAs2YQ9TpILBkx2p03Z 6ga0xVuK+BK9Qgl1abgHF2ZsTh32VkIyA91V8MvoJ3PWbLlEHi5XW9ui0pR6Oe6LV2Pp QgCRUgiXJNp4l2MX1IzIOoBWAFEaPhumsMG+x3tbTxum8eJOGLXkOpTyVxWUxEkNohDe utCw== X-Gm-Message-State: AOJu0YzCqVzLNnTxNklu4QII2nS8IEYSfPwEtsrlPwb3tv5TNNv/Cny/ 4VCKaVAbW7WQSfr9L6NovB3BKhyFFZ6pRevYWy4erF13/uhXz+QAiwDpqNCCDoE= X-Gm-Gg: ASbGncs8lGuhcWwQ3ZQ84bfYiaCAyV9YaJBIS9typ2MU6kVw1Ed7o9qF5aP47R0KBr7 Vdbk70GCliDOkfToaZOgYDYblx06h3KAv+eU/A2NQYxge1jbYE10FvQOS/764u8QihqLYHyiGth zFlfCVAcyiy5hQU7YWEPXFoTQKhwc4RbYuoQSPnIA1TJp9YDI2Nnq6XcmSg9Ve2kbGUAJckXYSy M9GqmQTmWhPtysQE5ztYjdxdBGhjqr/g00bmS5vM2wLcuxP8m6U4RYlN4xpc3xp 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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..223eb6bfd0579768c246dcc5183= 1048627fb8d02 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" =20 diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998= x_drv.c index 82d4a4e206a584e045a8fcd593fc12b7c1257bfe..ebc758c72891188e236d4da0cde= 283f108d80aca 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 =20 #include =20 +#include + #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) =20 enum { @@ -1717,10 +1718,10 @@ static int tda998x_get_audio_ports(struct tda998x_p= riv *priv, u8 ena_ap =3D be32_to_cpup(&port_data[2*i+1]); =20 switch (afmt) { - case AFMT_I2S: + case TDA998x_I2S: route =3D AUDIO_ROUTE_I2S; break; - case AFMT_SPDIF: + case TDA998x_SPDIF: route =3D AUDIO_ROUTE_SPDIF; break; default: @@ -1746,44 +1747,6 @@ static int tda998x_get_audio_ports(struct tda998x_pr= iv *priv, return 0; } =20 -static int tda998x_set_config(struct tda998x_priv *priv, - const struct tda998x_encoder_params *p) -{ - priv->vip_cntrl_0 =3D 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 =3D 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 =3D 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 !=3D AFMT_UNUSED) { - unsigned int ratio, route; - bool spdif =3D p->audio_params.format =3D=3D AFMT_SPDIF; - - route =3D AUDIO_ROUTE_I2S + spdif; - - priv->audio.route =3D &tda998x_audio_route[route]; - priv->audio.cea =3D p->audio_params.cea; - priv->audio.sample_rate =3D 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 =3D p->audio_params.config; - priv->audio.i2s_format =3D I2S_FORMAT_PHILIPS; - - ratio =3D 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 =3D 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 =3D tda998x_set_config(priv, dev->platform_data); - if (ret) - goto fail; } =20 priv->bridge.funcs =3D &tda998x_bridge_funcs; diff --git a/include/drm/i2c/tda998x.h b/include/drm/i2c/tda998x.h deleted file mode 100644 index 3cb25ccbe5e68bf95ce13249f15549b7e2582281..000000000000000000000000000= 0000000000000 --- 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 =3D 0, - AFMT_SPDIF =3D TDA998x_SPDIF, - AFMT_I2S =3D 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 --=20 2.39.5 From nobody Wed Dec 17 17:58:38 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56A251FDA81 for ; Mon, 13 Jan 2025 09:53:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762033; cv=none; b=lKiOytnpFAH7y1wLXpR6tLiLN+c5MeGlSX483+ZFdDuH/TxEOUf9p3ChwwoifhCwmYLUJgi+0t5y/zLfoy/biPCaGE+M++dgbGl3BSdiDYHD3KqHuInt5R59Zz45yTCOwQ7dQxLn5DAx/ArDv14QkuCHkT6CvczkbE30yVQ0mmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762033; c=relaxed/simple; bh=18CnAyxjLuzT65z1y3huWbOQwdYExGvyWFR+pnRfSqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nAW+hAb0JfEBQ3qRhN+4T1Z+3zQRc94I6qTjCDp2zAD/0WTNOXxCx/CRYD/ga7kFw26eLJLCznTlfBiZb7cex3NVGzPwchU/j7E3aez6DR1PLD2aGnCVbx9Z34zWxEDsX9BU9e54cvPC9YWg16z1vJtugdac1kWpEg2W/ZEIdf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nkQPG4ol; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nkQPG4ol" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-53f22fd6832so4154692e87.1 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=vger.kernel.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=nkQPG4olndFpg4DvmZHLGfjVa0iu72FTXsF5hg5IrBemntFJdqyUjPX/sEozAONW59 /J28nqk/vdeV1jPIjblzhCI25wqqUaD2qMh37axjp7Tfv6JDfeiwd9pP/b6RWtgar1nz KlAZNreVIMEB6dqeuBX7VAA9b7/Xchz912aAl/er9nS8e7s8hfz6MJ0bbp477MXtkRvP 9/ejcHJFfiBZHhfW0ozeXhJQQLethno//PLm95YOrj3PgPM5m/5WjN3fGh7SZ+Um27TD odfvvDZnOHPg+Yayfn1qNIKEf4y2Yu/qwoXJ3zmOXaFlJxZMQUFuUbclv2T45e6sC+kU mOiA== 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=k7vM0AJthUClZuSyUGCW+n/lbUsLoTbeS9UzlN5bNkSPkxw8Naep0AaSuP+GwyXqdL zccvFDKO6FDCjZWKK1E6Oq+S/OaK0MnMky/kYoU+N9d/Wn73CN1SNyQreIZQuY1RSiEU 8ENW1NWbQ3saMfceVmFc+43zD3vIR9eG/uuZ8dZGjP/EUAjcdPx+q76meapI38rxqxBC fVJ9ovDBBg0AZneikaI/PPL1hO1c24BMPRFootkccIyuNKOf8DXi1qdJwdIudAlig3gN bxmUVFdn8alYI9xsb0B67hEr71aNV3yPcVFoog4K73Js9j7mWbfKpo/aiGgut1WVZQxb dhQA== X-Gm-Message-State: AOJu0YyICUBGhpP96zQ/AHb0ekT7EjfexZGgQoNcLKswWcQSeiivuEjB DcrGaui+Hl8LS1TsjRHMlz/5MTicYGE3b2tsHhY+1VZKRliyXNFYtgCW2FKfcOg= X-Gm-Gg: ASbGncs8qZF5tKPHOeBv27G/zbSR/NTzJ/8TphMkbTPCW4EsAH81uO/22a4u3M/8YOQ WjM87RVaPKOWPhOPwZgSAKOMqHdZ74scpCNWXt9nf5VVlOEnvOhos8sRFj5zTdCHbh+xCM1rCBd +7otUGJQYqfJU0CvZT6pvO7e39ZKrIKCrXPedgLzadWBMXvFnYpgY900NiTGnLKP+TUvIC78GbX ++q0LKJodRACnhuOciYy2hMuh1bunSyJbJCblFKZUjqq92Wwr9tvUcN5y77kwuz 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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 =3D> 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..1aa2a0bf5cc183b4ce92fc4f7eb= 61fd0065250d1 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. =20 -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..45791fbfae983eecf58565109cf= 8eecb6431643b 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 :=3D tda998x_drv.o obj-$(CONFIG_DRM_I2C_NXP_TDA998X) +=3D tda998x.o -obj-$(CONFIG_DRM_I2C_NXP_TDA9950) +=3D tda9950.o diff --git a/drivers/media/cec/i2c/Kconfig b/drivers/media/cec/i2c/Kconfig index d912d143fb3129c6b3d0133dbfceffdd48bd543d..b9d21643eef1892ccff508b1864= db30e83570212 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..95c9eda5258361c4d9196acb527= e0c1b4351dbe0 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) +=3D ch7322.o +obj-$(CONFIG_CEC_NXP_TDA9950) +=3D 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 --=20 2.39.5 From nobody Wed Dec 17 17:58:38 2025 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F06420459B for ; Mon, 13 Jan 2025 09:53:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762035; cv=none; b=KzJCZ4tRQDO2fjDeaiTLtGAPOQTyPwF+I7BIwIGcrM4ApPLI+9DbDaBa0x9VyaUzAJZoF3ux8+5yzaiVlMo9gUknaMpeHYm39vXaae/K4heQUu4USuRE3/3WWjabP6TACKHprfJo0Lt+WTJy3ewvraV6k6TbBhPCt39yXQAITvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736762035; c=relaxed/simple; bh=Ic17kfBFEswigerUPPyAWbVpLAW5I7CJRGIoF3f2Cz4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HQPGjAzTp2KtcFZEytw2HBUbMjSZGJ1hCl6Xe0fJCltSIr3Ig0WEKNpvUbaJY0G8fSkzYf/a0KA+5xEIHkfNKabdsTVoxRuZx3qFB7vOSCESUuvstDhx4+C8ugkIA37DtxXrIxhFlS3GZ4+DyyuMd2dhusuqYaVjBhlqI9X8jik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nAhcCpes; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nAhcCpes" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-54020b0dcd2so4967173e87.1 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=vger.kernel.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=nAhcCpesne6L1QEgNnbO1ue9CkbiD+ShhTMVvd61BEgJrzvaFkW+v7JAU7IwP3SCAz AbEX5mMCrzDHTUksBy86X9DWGFHGfANqGM+Qrp1WUUz+lOzfpGcMoQK7LKTcvsr7ftAl VN0J+B0F0gtzJTd7KAOq9kilICPjN3a0/K+jgdpZKfIu6lj9Xn5EsZd3hDgAZyhxqC4b 078Sa1uM+sbrMZzIEinE+vwPkBX+WEmgvMIG/d48Qe22kZlsCQTOc9N1ycrDhg6pZiGe Qi2p6KsfFAgwQg54Tf8SpPz1DqRi+MpjGnt8u+zPLdg9iRA0UueGu+T78mM0HPjHQhEK x88Q== 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=eNeD0hbDBRYmwEYt0M5uv1hxqDgNuhWOiOEzDlk3+D0n2Blvr/xcm+6YCCh3xw8Qjg 1zz1O147l1dtgSUaaCmxK5OP01fyDn+VMpGSo+3Efm9mJ0hDVgfnDPSM3A/gfOn7+7j/ fisQPlSLmiflNpuym9CTlgFadAF0FhPCUDnQdQh1oIK8SMoqcfdU9qhTLHaCYbTJxXVy Q9oxbJcDyzCos/aMvEKVA4IRyZRDuRNiLVUQx2bdmDF7RAo4AOXwTYzyc3OE5CvFndBr WtfjfOk5WX5/Cs5tFp6HRdRcx9zA1MI5DKCtIZmjXSUDsP3RaAew/sdLRpgpo7FDQMaR Tp3g== X-Gm-Message-State: AOJu0YxTxYH0gLx7SXAU72COnXGTcwf2KpZLlpY20Tx9oMKXQEeWFgic qut8dex9lrMeXqWUiJTte9LVEbiJkc7fYGEiZo/KMFNV3yDNHN9yFJLKm8SeRH8= X-Gm-Gg: ASbGncuT+L3vdMOd3tsSg7Sw2cKDXA56HK1h2y39nAr4Ih73H6irlihfoRUKe8HawU9 +LF0lXmpTrIJLmlRSz09tpRNcMXU+cBxN3jZFWjKcBs/SCmUF6p54Yx2KjYJuX5JwrDFP2BA985 D7QJDZb96gfIMSefTF6NCijK8wVkzG3dhlRxSPezjmCmJXD6+GDqrA9IwO/tyi/pQcxCcUs/aC7 qZeh0hlWjf/54JLnqeJQzyLqP0SNriLjZyqQQooUYKEyjne0ZGE1ibqnUkOgxWJ 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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 =3D> 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..7a15fb49c2905dcba7bc08f03ab= e12bd7f493f84 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" =20 diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig index c901ac00c0c3a8f356bd53d97305c6b39b3e6662..ed3ed617c6884876368c8bd072c= 53f1b710df443 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..d20f1646dac27898ecb7599a9a0= 6663357dcca14 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. =20 +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/Makef= ile index 97304b429a530c108dcbff906965cda091b0a7a2..245e8a27e3fc525ffe02103e443= 6c71313f55d9a 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -6,6 +6,10 @@ obj-$(CONFIG_DRM_CHRONTEL_CH7033) +=3D chrontel-ch7033.o obj-$(CONFIG_DRM_CROS_EC_ANX7688) +=3D cros-ec-anx7688.o obj-$(CONFIG_DRM_DISPLAY_CONNECTOR) +=3D display-connector.o obj-$(CONFIG_DRM_FSL_LDB) +=3D fsl-ldb.o + +tda998x-y :=3D tda998x_drv.o +obj-$(CONFIG_DRM_I2C_NXP_TDA998X) +=3D tda998x.o + obj-$(CONFIG_DRM_ITE_IT6263) +=3D ite-it6263.o obj-$(CONFIG_DRM_ITE_IT6505) +=3D ite-it6505.o obj-$(CONFIG_DRM_LONTIUM_LT8912B) +=3D lontium-lt8912b.o diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/bridge/tda= 998x_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..000000000000000000000000000= 0000000000000 --- 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..000000000000000000000000000= 0000000000000 --- a/drivers/gpu/drm/i2c/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -tda998x-y :=3D tda998x_drv.o -obj-$(CONFIG_DRM_I2C_NXP_TDA998X) +=3D tda998x.o --=20 2.39.5