| Message ID | 20250110-drm-move-tda998x-v2-0-ef2ae5832d21@linaro.org |
|---|---|
| Headers | show |
| Series | drm/i2c: tda998x: move under drivers/gpu/drm/bridge | expand |
On 10/01/2025 13:31, Dmitry Baryshkov wrote: > 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. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Regards, Hans > --- > 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 >
On 10/01/2025 13:31, Dmitry Baryshkov wrote: > 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). TDA9950 is an I2C-CEC translator, being present > on-die on the TDA9989 and TDA19989 chips. > > Move TDA9950 driver to drivers/media/cec/i2c and TDA998x driver to > drivers/gpu/drm/bridge/. > > Note to Hans and Mauro: I'd ask for all patches to be merged through > drm-misc tree rather than splitting them between drm-misc and media > trees. The patchset depends on the patches that are a part of > drm-misc-next, but are not going to hit 6.14. Please specify if you are > fine with that proposal and if you'd need an immutable branch for > linux-media. I'm fine that this goes through drm-misc. I don't see a need for an immutable branch. Regards, Hans > > Note to RMK: I didn't change that, but I'd like to propose to use > drm-misc tree for this bridge. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > Changes in v2: > - Moved TDA9950 driver to drivers/media/cec/i2c (Hans, Laurent) > - Moved TDA998x driver to drivers/gpu/drm/bridges istead of tda/ subdir > (Laurent) > - Link to v1: https://lore.kernel.org/r/20241215-drm-move-tda998x-v1-0-7817122b1d73@linaro.org > > --- > Dmitry Baryshkov (3): > drm/i2c: tda998x: drop support for platform_data > media: cec: move driver for TDA9950 from drm/i2c > drm/i2c: move TDA drivers under drivers/gpu/drm/bridge > > MAINTAINERS | 3 +- > 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 | 49 +++------------------------ > drivers/gpu/drm/i2c/Kconfig | 18 ---------- > drivers/gpu/drm/i2c/Makefile | 4 --- > drivers/media/cec/i2c/Kconfig | 9 +++++ > drivers/media/cec/i2c/Makefile | 1 + > drivers/{gpu/drm => media/cec}/i2c/tda9950.c | 0 > include/drm/i2c/tda998x.h | 40 ---------------------- > 11 files changed, 28 insertions(+), 109 deletions(-) > --- > base-commit: e91570cf7c1b3e406878e7b1efbe823d039d1659 > change-id: 20241214-drm-move-tda998x-8fb4321434d2 > > Best regards,
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). TDA9950 is an I2C-CEC translator, being present on-die on the TDA9989 and TDA19989 chips. Move TDA9950 driver to drivers/media/cec/i2c and TDA998x driver to drivers/gpu/drm/bridge/. Note to Hans and Mauro: I'd ask for all patches to be merged through drm-misc tree rather than splitting them between drm-misc and media trees. The patchset depends on the patches that are a part of drm-misc-next, but are not going to hit 6.14. Please specify if you are fine with that proposal and if you'd need an immutable branch for linux-media. Note to RMK: I didn't change that, but I'd like to propose to use drm-misc tree for this bridge. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- Changes in v2: - Moved TDA9950 driver to drivers/media/cec/i2c (Hans, Laurent) - Moved TDA998x driver to drivers/gpu/drm/bridges istead of tda/ subdir (Laurent) - Link to v1: https://lore.kernel.org/r/20241215-drm-move-tda998x-v1-0-7817122b1d73@linaro.org --- Dmitry Baryshkov (3): drm/i2c: tda998x: drop support for platform_data media: cec: move driver for TDA9950 from drm/i2c drm/i2c: move TDA drivers under drivers/gpu/drm/bridge MAINTAINERS | 3 +- 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 | 49 +++------------------------ drivers/gpu/drm/i2c/Kconfig | 18 ---------- drivers/gpu/drm/i2c/Makefile | 4 --- drivers/media/cec/i2c/Kconfig | 9 +++++ drivers/media/cec/i2c/Makefile | 1 + drivers/{gpu/drm => media/cec}/i2c/tda9950.c | 0 include/drm/i2c/tda998x.h | 40 ---------------------- 11 files changed, 28 insertions(+), 109 deletions(-) --- base-commit: e91570cf7c1b3e406878e7b1efbe823d039d1659 change-id: 20241214-drm-move-tda998x-8fb4321434d2 Best regards,