aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-25 06:43:12 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-29 11:35:06 -0300
commit79a63c60a6a2ae589e44529401e0ab1150e9408a (patch)
tree8d374af399007ac12e5b64d6b45f2da99435ed91 /drivers/staging/media
parent38a46c2128ade2a0c6ee4438297180b09a01c309 (diff)
downloadvexpress-lsk-79a63c60a6a2ae589e44529401e0ab1150e9408a.tar.gz
[media] media: move dvb-usb-v2/cypress_firmware.c to media/common
Loading the cypress firmware is not dvb specific and should be common functionality. Move the source to media/common and make it a standalone module. As a result we can remove the dependency on dvb-usb in go7007, which has nothing to do with dvb. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/go7007/Kconfig3
-rw-r--r--drivers/staging/media/go7007/Makefile6
-rw-r--r--drivers/staging/media/go7007/go7007-loader.c4
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/media/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig
index b10f99684ff..6cdc6ba3b1e 100644
--- a/drivers/staging/media/go7007/Kconfig
+++ b/drivers/staging/media/go7007/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_GO7007
depends on SND
select VIDEOBUF2_VMALLOC
select VIDEO_TUNER
+ select CYPRESS_FIRMWARE
select SND_PCM
select VIDEO_SONY_BTF_MPX if MEDIA_SUBDRV_AUTOSELECT
select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
@@ -33,7 +34,7 @@ config VIDEO_GO7007_USB
config VIDEO_GO7007_LOADER
tristate "WIS GO7007 Loader support"
- depends on VIDEO_GO7007 && DVB_USB
+ depends on VIDEO_GO7007
default y
---help---
This is a go7007 firmware loader driver for the WIS GO7007
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index bbc8a32027e..9c6ad4a263e 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -12,8 +12,4 @@ s2250-y := s2250-board.o
#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134
-# go7007-loader needs cypress ezusb loader from dvb-usb-v2
-ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/usb/dvb-usb-v2
-
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/dvb-core
+ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common
diff --git a/drivers/staging/media/go7007/go7007-loader.c b/drivers/staging/media/go7007/go7007-loader.c
index 4ce53d6e852..f846ad5819d 100644
--- a/drivers/staging/media/go7007/go7007-loader.c
+++ b/drivers/staging/media/go7007/go7007-loader.c
@@ -85,7 +85,7 @@ static int go7007_loader_probe(struct usb_interface *interface,
"unable to load firmware from file \"%s\"\n", fw1);
goto failed2;
}
- ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
+ ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
release_firmware(fw);
if (0 != ret) {
dev_err(&interface->dev, "loader download failed\n");
@@ -100,7 +100,7 @@ static int go7007_loader_probe(struct usb_interface *interface,
"unable to load firmware from file \"%s\"\n", fw2);
goto failed2;
}
- ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
+ ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
release_firmware(fw);
if (0 != ret) {
dev_err(&interface->dev, "firmware download failed\n");