upstream: [media] tea575x: Move from sound to media

Move tea575x from sound/i2c/other to drivers/media/radio
Includes Kconfig changes by Hans Verkuil.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index d529ba7..39882dd 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -12,6 +12,9 @@ menuconfig RADIO_ADAPTERS
 
 if RADIO_ADAPTERS && VIDEO_V4L2
 
+config RADIO_TEA575X
+       tristate
+
 config RADIO_SI470X
        bool "Silicon Labs Si470x FM Radio Receiver support"
        depends on VIDEO_V4L2
@@ -61,7 +64,8 @@ config USB_DSBR
 
 config RADIO_MAXIRADIO
        tristate "Guillemot MAXI Radio FM 2000 radio"
-       depends on VIDEO_V4L2 && PCI && SND
+       depends on VIDEO_V4L2 && PCI
+       select RADIO_TEA575X
        ---help---
          Choose Y here if you have this radio card.  This card may also be
          found as Gemtek PCI FM.
@@ -76,7 +80,8 @@ config RADIO_MAXIRADIO
 
 config RADIO_SHARK
        tristate "Griffin radioSHARK USB radio receiver"
-       depends on USB && SND
+       depends on USB
+       select RADIO_TEA575X
        ---help---
          Choose Y here if you have this radio receiver.
 
@@ -393,7 +398,8 @@ config RADIO_SF16FMI
 
 config RADIO_SF16FMR2
        tristate "SF16-FMR2/SF16-FMD2 Radio"
-       depends on ISA && VIDEO_V4L2 && SND
+       depends on ISA && VIDEO_V4L2
+       select RADIO_TEA575X
        ---help---
          Choose Y here if you have one of these FM radio cards.
 

diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index 0dcdb32..3b64560 100644 (file)
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_RADIO_TEF6862) += tef6862.o
 obj-$(CONFIG_RADIO_TIMBERDALE) += radio-timb.o
 obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o
 obj-$(CONFIG_RADIO_WL128X) += wl128x/
+obj-$(CONFIG_RADIO_TEA575X) += tea575x.o
 
 shark2-objs := radio-shark2.o radio-tea5777.o
 

diff --git a/sound/i2c/other/tea575x-tuner.c b/drivers/media/radio/tea575x.c
similarity index 100%
rename from sound/i2c/other/tea575x-tuner.c
rename to drivers/media/radio/tea575x.c

diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile
index c95d8f1..5526b03 100644 (file)
--- a/sound/i2c/other/Makefile
+++ b/sound/i2c/other/Makefile
@@ -8,10 +8,8 @@ snd-ak4117-objs := ak4117.o
 snd-ak4113-objs := ak4113.o
 snd-ak4xxx-adda-objs := ak4xxx-adda.o
 snd-pt2258-objs := pt2258.o
-snd-tea575x-tuner-objs := tea575x-tuner.o
 
 # Module Dependency
 obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
 obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
 obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
-obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 3397ddb..fdc8fca 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,10 +1,5 @@
 # ALSA PCI drivers
 
-config SND_TEA575X
-       tristate
-       depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
-       default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
-
 menuconfig SND_PCI
        bool "PCI sound devices"
        depends on PCI
@@ -549,7 +544,9 @@ config SND_ES1968_INPUT
 config SND_ES1968_RADIO
        bool "Enable TEA5757 radio tuner support for es1968"
        depends on SND_ES1968
+       depends on MEDIA_RADIO_SUPPORT
        depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968
+       select RADIO_TEA575X
        help
          Say Y here to include support for TEA5757 radio tuner integrated on
          some MediaForte cards (e.g. SF64-PCE2).
@@ -569,7 +566,9 @@ config SND_FM801
 config SND_FM801_TEA575X_BOOL
        bool "ForteMedia FM801 + TEA5757 tuner"
        depends on SND_FM801
+       depends on MEDIA_RADIO_SUPPORT
        depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801
+       select RADIO_TEA575X
        help
          Say Y here to include support for soundcards based on the ForteMedia
          FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and