From patchwork Fri Jan 10 12:31:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13934450 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 A3E9120E308 for ; Fri, 10 Jan 2025 12:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736512326; cv=none; b=ubOnD2JBItdMGEKZEWVJkBWduTbspUCn2SVW8c+GD09APJGZ9UXmJdFKi2HShk8zDFXAVVg18TpBG9EtiQVUQ3mN3pNaQgsTEpAf2rEgMzoDSnthclyPViXlj8bw82ROtFFewBlrRK6FxAbjASelz9pxFaZ+p350v+Ez1MkhuBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736512326; c=relaxed/simple; bh=g+7ytvieuvI7RKTOj/q24QGGdISGbPrB0TEqnLrOfZk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tgrhv9SDRdnT++sFtwBD6eU0J3BEiXk3eNKnB27NiE5qBN291VZ6KYvfv6CmhddA2U2qDGkxL1Xaf/zFiMAEZJ8ske1n+aU7Vuiwn41IV2kegozEk9wM8g5ofn5KOmEaKY7eprn04YG9/EyfODCFnHvxV+yiS/ga8HE6BNVYWqk= 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=qmg0gEK8; arc=none smtp.client-ip=209.85.208.173 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="qmg0gEK8" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-30229d5b21cso17746281fa.1 for ; Fri, 10 Jan 2025 04:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736512323; x=1737117123; 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=hiEWcElxhZTK73TnXgswdyP6JxZMw7F27l1xnn3hpWk=; b=qmg0gEK8DucqitLAPmKlR2wKd8cfUm9UDEo3Csr8P7o97+MrX849NHXzB+VqOSSU5/ 8LY6dEauLkLYLvm+no/2DPhkn24Ofz8Pfe9TUg9V2kBYCpppmSg02rM0SoMiCfSWEx8n hkLXorlh3LmS3ESopQf8rCXinLPlPiGBhe9f+l5JkFnq8nE/S+ZkcTRTV2Jh+pcrHgSQ 9Xlec5Y7hZ7FMcRSMXUkriPctkdQD5xNG3jWyYumv5QkBlQJBoCPQVgkKLbIIiY4Ykuj QXMqBRZOuwoKgUo2xc18VmcgkLuU3+6EJQ6lQ5eNhu+0R7xI2oWKeLwC/emZk1zsl/8m nPTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736512323; x=1737117123; 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=hiEWcElxhZTK73TnXgswdyP6JxZMw7F27l1xnn3hpWk=; b=sa9IHtYVLCAC7KPqMi7im7NCkRgwyrv7Y2w53cmsopZ6qbKcAxEpHm8sP0iz6RITdg N4XVPNw0Lc2PsLPo6lu4aVtfY+t1nr0Jx7owdXv3dxLrgTeScGw4oD5XbQ1oPJFJS5Ts pHhdHSK1XYcj5sG+xmbNuy3xWdBNxITO8ib0jFF2jxofe9ajl6lOSd+/FXAgOca5fK7y vLSZyTLEyLhIyLjj95koWuKeWPBbhDuj6jhXykQUiPmHtUZimFqTlPGqWPFf34Lef+0+ xtUCoYyn4NLrnvWTjkH6/rzvnQvijT1rAfZgnT8DfTco0zdMSRHafrkqszr9NdEpPy0a iCMg== X-Forwarded-Encrypted: i=1; AJvYcCUGcrQvx4MZXPlNOssgq02RVyLJeVZDCiqvZSKLVfm7n3gezjdValao/HYkEw4aamwbGglg5WjuTlKLxw==@vger.kernel.org X-Gm-Message-State: AOJu0Yw41p7fJCjwzNHC6uza3pAhJTUgXBasTLkGvBlNauyPWx+nu5xc qvDvBtlQohAAl2B2xAff0YabSXOfLxEJ+4PdiF2L6a5lWiQAxLbBs1ZnSTKbNCs= X-Gm-Gg: ASbGncvD5tw+GO8kXOmBhVRO6dtbjhCdBd8UBtpEUp+9JI8mq+iGdyWdueAYNdqNQfd 47QJcuX0aY1NxY47MjGqKaHMF4ZdQjyRVcIKhz9BW5IWTz3nny+4eJrOBb3FqtXVTUikgqn3KEl aMfFW3NQydl4k6Wz/v6bVh3HahgN4EyktxzZgHp9/9S93AxdYx4v4H1xdbQmx9sl+Q5k80Qpp9e Q3+re/GPuw/o/mRQdz41IlxphQkxvOrW6ADxIZ5aBpiwdv9ka6lZvl2IoW8+zIY X-Google-Smtp-Source: AGHT+IHDSOgExi0q9r6Qp60KV0c5WHDnz8FIQrxe1koxDTMIZtWbTmGKRVyZC0HDHCHMKRyp+Z0SjA== X-Received: by 2002:a05:651c:1a0c:b0:2fc:9622:794b with SMTP id 38308e7fff4ca-305f45a4294mr31226241fa.24.1736512322679; Fri, 10 Jan 2025 04:32:02 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-305ff0cedafsm4720691fa.29.2025.01.10.04.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 04:32:01 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 10 Jan 2025 14:31:55 +0200 Subject: [PATCH v2 3/3] drm/i2c: move TDA drivers under drivers/gpu/drm/bridge Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250110-drm-move-tda998x-v2-3-ef2ae5832d21@linaro.org> References: <20250110-drm-move-tda998x-v2-0-ef2ae5832d21@linaro.org> In-Reply-To: <20250110-drm-move-tda998x-v2-0-ef2ae5832d21@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=4898; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=g+7ytvieuvI7RKTOj/q24QGGdISGbPrB0TEqnLrOfZk=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ3qjsE0c92aDhzJ7Yv13+amIte8Pn708fZ1ERGhtM9M3N zbF6X86GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjARxbns/xN+Z3QWbFrlw68o GTldfeuBh+I+fL/UU23C4ifv9j7YevdqVQmf8Z8Pk3r61UvmMnbNKTsRandK/9c/FxtF+6eL/Q7 93aAZIcjz/0rF7PwPU26HM75c+TfrdXCAtNnT3Jn7e+ez9//J+WmcuqztR3M7X3LSUtdN5kanRU OD3ntvU/vtfe90kHXYcv3SVSo85nwqPi6fzCLfbr5y8PDi2F3TIkqyg5eZX7rg8iNyl5m4VuP0x 6cWrubJOuns7Lcp7L1u6IVnhl2nZCM8kvdtt5h86EGChLjOyaLkpcmsAlbaSh28PiKCzzVcLu/y MDHgTW+YbDt9Zt9ZxgrLNTWJN++vyXhazzLL7+MF7oxyAA== 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/. TDA9950 is an I2C-CEC translator, being present on-die on the TDA9989 and TDA19989 chips, so it is being instantiated by the TDA998x driver. Move it together with the TDA998x under bridge drivers subdir. 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