S:     Supported
 F:     drivers/media/dvb-frontends/cxd2841er*
 
+MEDIA DRIVERS FOR CXD2880
+M:     Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+T:     git git://linuxtv.org/media_tree.git
+S:     Supported
+F:     drivers/media/dvb-frontends/cxd2880/*
+F:     drivers/media/spi/cxd2880*
+
 MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 M:     Daniel Scheller <d.scheller.oss@gmail.com>
 L:     linux-media@vger.kernel.org
 
        depends on DVB_CORE
        default DVB_USB_GP8PSK
 
+source "drivers/media/dvb-frontends/cxd2880/Kconfig"
+
 comment "DVB-C (cable) frontends"
        depends on DVB_CORE
 
 
 obj-$(CONFIG_DVB_HELENE) += helene.o
 obj-$(CONFIG_DVB_ZD1301_DEMOD) += zd1301_demod.o
 obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
+obj-$(CONFIG_DVB_CXD2880) += cxd2880/
 
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0
+
+config DVB_CXD2880
+       tristate "Sony CXD2880 DVB-T2/T tuner + demodulator"
+       depends on DVB_CORE && SPI
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         Say Y when you want to support this frontend.
\ No newline at end of file
 
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0
+
+cxd2880-objs := cxd2880_common.o \
+               cxd2880_devio_spi.o \
+               cxd2880_integ.o \
+               cxd2880_io.o \
+               cxd2880_spi_device.o \
+               cxd2880_tnrdmd.o \
+               cxd2880_tnrdmd_dvbt2.o \
+               cxd2880_tnrdmd_dvbt2_mon.o \
+               cxd2880_tnrdmd_dvbt.o \
+               cxd2880_tnrdmd_dvbt_mon.o\
+               cxd2880_tnrdmd_mon.o\
+               cxd2880_top.o
+
+obj-$(CONFIG_DVB_CXD2880) += cxd2880.o
+
+ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-frontends
 
 endmenu
 
 endif
+
+if SPI
+menu "Media SPI Adapters"
+
+config CXD2880_SPI_DRV
+       tristate "Sony CXD2880 SPI support"
+       depends on DVB_CORE && SPI
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         Choose if you would like to have SPI interface support for Sony CXD2880.
+
+endmenu
+
+endif
 
 obj-$(CONFIG_VIDEO_GS1662) += gs1662.o
+obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o
+
+ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -Idrivers/media/dvb-frontends/cxd2880