From 77bbb2b049c1c3e935f5bec510bec337d94ae8f8 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Tue, 15 Jul 2014 02:08:38 +0300 Subject: [PATCH] rtl2832_sdr: move from staging to media Move rtl2832_sdr driver module from staging to media. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb-frontends/Kconfig | 9 +++++++++ drivers/media/dvb-frontends/Makefile | 6 ++++++ .../media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.c | 0 .../media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.h | 0 drivers/media/usb/dvb-usb-v2/Kconfig | 1 + drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/media/rtl2832u_sdr/Kconfig | 7 ------- drivers/staging/media/rtl2832u_sdr/Makefile | 6 ------ 9 files changed, 16 insertions(+), 16 deletions(-) rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.c (100%) rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.h (100%) delete mode 100644 drivers/staging/media/rtl2832u_sdr/Kconfig delete mode 100644 drivers/staging/media/rtl2832u_sdr/Makefile diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index 1469d44acb22..7225f059ba2d 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -446,6 +446,15 @@ config DVB_RTL2832 help Say Y when you want to support this frontend. +config DVB_RTL2832_SDR + tristate "Realtek RTL2832 SDR" + depends on DVB_CORE && I2C && VIDEO_V4L2 + select DVB_RTL2832 + select VIDEOBUF2_VMALLOC + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Say Y when you want to support this SDR module. + config DVB_SI2168 tristate "Silicon Labs Si2168" depends on DVB_CORE && I2C && I2C_MUX diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index dda0bee36f29..655e3c8ac173 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -5,6 +5,11 @@ ccflags-y += -I$(srctree)/drivers/media/dvb-core/ ccflags-y += -I$(srctree)/drivers/media/tuners/ +# FIXME: RTL2832 SDR driver uses power management directly from USB IF driver +ifdef CONFIG_DVB_RTL2832_SDR + ccflags-y += -I$(srctree)/drivers/media/usb/dvb-usb-v2 +endif + stb0899-objs := stb0899_drv.o stb0899_algo.o stv0900-objs := stv0900_core.o stv0900_sw.o drxd-objs := drxd_firm.o drxd_hard.o @@ -104,6 +109,7 @@ obj-$(CONFIG_DVB_A8293) += a8293.o obj-$(CONFIG_DVB_TDA10071) += tda10071.o obj-$(CONFIG_DVB_RTL2830) += rtl2830.o obj-$(CONFIG_DVB_RTL2832) += rtl2832.o +obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o obj-$(CONFIG_DVB_AF9033) += af9033.o diff --git a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c similarity index 100% rename from drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c rename to drivers/media/dvb-frontends/rtl2832_sdr.c diff --git a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.h b/drivers/media/dvb-frontends/rtl2832_sdr.h similarity index 100% rename from drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.h rename to drivers/media/dvb-frontends/rtl2832_sdr.h diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig index 037e519bbaa2..0ea144e5e88d 100644 --- a/drivers/media/usb/dvb-usb-v2/Kconfig +++ b/drivers/media/usb/dvb-usb-v2/Kconfig @@ -129,6 +129,7 @@ config DVB_USB_RTL28XXU depends on DVB_USB_V2 && I2C_MUX select DVB_RTL2830 select DVB_RTL2832 + select DVB_RTL2832_SDR if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MXL5005S if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 5942414d3a04..8abda145e597 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -40,8 +40,6 @@ source "drivers/staging/media/solo6x10/Kconfig" source "drivers/staging/media/omap4iss/Kconfig" -source "drivers/staging/media/rtl2832u_sdr/Kconfig" - # Keep LIRC at the end, as it has sub-menus source "drivers/staging/media/lirc/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 730c2659cccd..74a9d5a57bc2 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -11,5 +11,4 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/ obj-$(CONFIG_VIDEO_TCM825X) += omap24xx/ -obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832u_sdr/ diff --git a/drivers/staging/media/rtl2832u_sdr/Kconfig b/drivers/staging/media/rtl2832u_sdr/Kconfig deleted file mode 100644 index 3ede5fe8f0a5..000000000000 --- a/drivers/staging/media/rtl2832u_sdr/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -config DVB_RTL2832_SDR - tristate "Realtek RTL2832 SDR" - depends on USB && DVB_CORE && I2C && VIDEO_V4L2 && DVB_USB_RTL28XXU - select DVB_RTL2832 - select VIDEOBUF2_VMALLOC - default m if !MEDIA_SUBDRV_AUTOSELECT - diff --git a/drivers/staging/media/rtl2832u_sdr/Makefile b/drivers/staging/media/rtl2832u_sdr/Makefile deleted file mode 100644 index 7e00a0df4631..000000000000 --- a/drivers/staging/media/rtl2832u_sdr/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o - -ccflags-y += -Idrivers/media/dvb-core -ccflags-y += -Idrivers/media/dvb-frontends -ccflags-y += -Idrivers/media/tuners -ccflags-y += -Idrivers/media/usb/dvb-usb-v2 -- 2.11.0