From nobody Wed Dec 17 19:37:34 2025 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 BB11B17991 for ; Sun, 15 Dec 2024 11:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734260956; cv=none; b=a1Tu1L40qGTSqwExuDBAA/Utr9n6MiUd70GRyDfgR9HsJU7LACGsWuW0yyP22Vi7ZCt26MZKgAPL0rnkmj5erYRj6133fuOCxLVWHRxqU1EaB7nxO3ahxU2RcSFluvRPLBohtgd5QGpv5V6WweFk8nCz6OPcw/YhrvfbGVBXmHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734260956; c=relaxed/simple; bh=o+xrs1mABCZ1wQWMUhylhusFC7U0FTHkooDzXrbcyDs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jiaqa3f9SuTY8u9EJYCCpEzmqhFhUtF8qxP7peOIgqDlhhFplfkp3VDE1j338j59EHh9WIQRJx9ZFxVQNe/D5e8DVAHvgUpxTJ9DcxnX6VPWhvNUgPlNWmGVNMhcbcAj4mQkDcRoyfFwDqZ6sMDLKN8qyWn3T05Wlac/M9/WF8Y= 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=h0oZNuOf; arc=none smtp.client-ip=209.85.208.171 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="h0oZNuOf" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-3002c324e7eso36069651fa.3 for ; Sun, 15 Dec 2024 03:09:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734260952; x=1734865752; 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=ok2Fb7LkB/RM1ucE2UZDhgpxrMCyHz4b6tMDMVk3i8I=; b=h0oZNuOfnDNLd+HRwj2BHeTf5ICB6ILFGY2lnErPMCrTO2zeUNw8agOMv4kA1BN7YQ rR8/FWSu0AI1KdkXxnBJMV52j7OLlN5iYG+qEdopd1LjNIwl9IOANY6JgH88QxLpLFTW p8xNLtU0HnVCuX2zIXA7ZJfUOvIsr5bKCofCyg2eahbRCuLK3S+IGO4ALAlGkXIsJTo/ 68wPdm/GVwcV3V5gWRGc8EEY/vdlsNSaB8yKhwiT7Aa5fBkxJyFSYqFwNdvQRPZ+92R4 SOjkSPUBrwJWcEUS+30n+HJfvVlPgkXRLOF46vtklw0TuYgKFESYKb8TVics9ZLP8+H3 kC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734260952; x=1734865752; 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=ok2Fb7LkB/RM1ucE2UZDhgpxrMCyHz4b6tMDMVk3i8I=; b=NizrgjD2yzVVmuFkQQtV4fDokDhRTljaVoA581+Vya4HGvpL8f4xfwBWzqysISROCt cOUjuTXqEGOHzmqLueQTdwo4RcSAlrDOiIKQkQvovIu4IFIzZb0BJFptwJhgpEW3hgvN Kg8+m+WQ4GXgXE74LaRUx42o0kjjHFAXOSkKx60STQU1Qv7Dy96j40Hfqe6LEWX66ZvP TKFYhtdu3M7dNzz+CLhs3UPL61DfYgPuBS4J2Ma90ukROfzaSaLoR2xTueIW26ICR1fG k4K5FlJ1knBq9dKcONkCU611Yrf+UI2yBK+J0wFNJGSshOrZ5114o3PN2H8p8lyiR5Ya RQ3w== X-Gm-Message-State: AOJu0YyG2xvGE3fhlwrlaUEK32ujEAZct7wIU2h5LDs4qLsyFKQ+ZRLM e/cWZyQSEVcVuQkZnj/WsK5yW8qPl5/tz51FKhZYEUAHo2+mszBbAAI+p2HSXwUOuS/FA6KDARx P X-Gm-Gg: ASbGncsN5e3r+/Etx+YXDaUKhiHRi12NEKgAfFGjUslPDneuRKIKyc9NhYE9zM8YKRu yPFFeSNMD4uvfe5ME8uulxDr0VnSF0XSSw3bBVmwd3i2HqLLSjVYqP12PaFgvNBAC5q0l3/FEew Q3PMQ4oQ8lrqq2WpPHHpnfXdDz7WC++CjGCfKaMagY3+ice0gyqILTKiDsIoX6EOu/55aHG6tl6 GQu86wOutV2yP94iyE/6EKRWn7GL8gZhENILCabfwVLPabP6+1yt/0fphBJNDaX X-Google-Smtp-Source: AGHT+IEBzRsf5g8lUjmxBKo0iQDL4bb/EE6SCLkY7sXa+6eAEE1l7IImuCOS5tCrIREpHBVdYnUlCw== X-Received: by 2002:a2e:be1c:0:b0:302:244a:da2c with SMTP id 38308e7fff4ca-3025459ceaamr33115551fa.31.1734260952563; Sun, 15 Dec 2024 03:09:12 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3034404544csm5261531fa.29.2024.12.15.03.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 03:09:12 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 15 Dec 2024 13:09:07 +0200 Subject: [PATCH 1/2] 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: <20241215-drm-move-tda998x-v1-1-7817122b1d73@linaro.org> References: <20241215-drm-move-tda998x-v1-0-7817122b1d73@linaro.org> In-Reply-To: <20241215-drm-move-tda998x-v1-0-7817122b1d73@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 Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4972; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=o+xrs1mABCZ1wQWMUhylhusFC7U0FTHkooDzXrbcyDs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnXrjU0utfw/UC8ok+JazFP4KUBh/53nG0wPqFi St95xMwwNSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1641AAKCRCLPIo+Aiko 1Y+/B/0bJvQ3SWSCCuB0+2XWWD+0s5yR24CN6cTI09fAuwx3miRMzh1o35X7MOMrA3azcmWW+iu xndFHLucB64yNdbXLZlaw87XKNU6h2MSZzW5z0pMkSS9CVsbdKS6GMNVPcRYjYymxexgOVeERw3 7b/54REFzgLcDms+GZxCXs8BmHCTI1hnsDbiBdF8VlcwuXsOHQcalurRBLTHW+L3mieGm54vxgX yeJLaZS8GWMBnzE8wAqLUUKm8hqlSK6lLglXdBr46HrDvsJW+dPNTZYUaopxF0wlZ60R1tCEqQO KQi6a/W9qt6tnGy9n/tdM/Tl3kf0lS8v0Ml+/CiZd5aBXrFV 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. Signed-off-by: Dmitry Baryshkov Reviewed-by: Laurent Pinchart --- 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 81348dbce8ca7c877bd9c2d88cb093368eca5a0a..9a23e80abf309cbd918a7468389= 5f8dbe0507a6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16983,7 +16983,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 2160f05bbd16d2346e27365e5549b75ad26fdcb9..67480dcbbfde4da68ffaeaf2093= 5af467d4da92a 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