From be304970850806abea880da95fbfb743a4d9f87d Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 23 Sep 2011 09:30:01 -0300
Subject: [PATCH] [media] move tm6000 to drivers/media/video
The serious bugs got fixed already.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
.../video4linux/CARDLIST.tm6000 | 0
drivers/media/video/Kconfig | 2 ++
drivers/media/video/Makefile | 1 +
.../{staging => media/video}/tm6000/Kconfig | 0
.../{staging => media/video}/tm6000/Makefile | 0
.../video}/tm6000/tm6000-alsa.c | 0
.../video}/tm6000/tm6000-cards.c | 0
.../video}/tm6000/tm6000-core.c | 0
.../video}/tm6000/tm6000-dvb.c | 0
.../video}/tm6000/tm6000-i2c.c | 0
.../video}/tm6000/tm6000-input.c | 0
.../video}/tm6000/tm6000-regs.h | 0
.../video}/tm6000/tm6000-stds.c | 0
.../video}/tm6000/tm6000-usb-isoc.h | 0
.../video}/tm6000/tm6000-video.c | 0
.../{staging => media/video}/tm6000/tm6000.h | 0
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/tm6000/README | 22 -------------------
drivers/staging/tm6000/TODO | 8 -------
20 files changed, 3 insertions(+), 33 deletions(-)
rename drivers/staging/tm6000/CARDLIST => Documentation/video4linux/CARDLIST.tm6000 (100%)
rename drivers/{staging => media/video}/tm6000/Kconfig (100%)
rename drivers/{staging => media/video}/tm6000/Makefile (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-alsa.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-cards.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-core.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-dvb.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-i2c.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-input.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-regs.h (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-stds.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-usb-isoc.h (100%)
rename drivers/{staging => media/video}/tm6000/tm6000-video.c (100%)
rename drivers/{staging => media/video}/tm6000/tm6000.h (100%)
delete mode 100644 drivers/staging/tm6000/README
delete mode 100644 drivers/staging/tm6000/TODO
diff --git a/drivers/staging/tm6000/CARDLIST b/Documentation/video4linux/CARDLIST.tm6000
similarity index 100%
rename from drivers/staging/tm6000/CARDLIST
rename to Documentation/video4linux/CARDLIST.tm6000
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4a10086bb460..aed5b3d740ca 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1019,6 +1019,8 @@ source "drivers/media/video/tlg2300/Kconfig"
source "drivers/media/video/cx231xx/Kconfig"
+source "drivers/media/video/tm6000/Kconfig"
+
source "drivers/media/video/usbvision/Kconfig"
source "drivers/media/video/et61x251/Kconfig"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 0f0c6af58d81..11fff97e7196 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
+obj-$(CONFIG_VIDEO_TM6000) += tm6000/
obj-$(CONFIG_VIDEO_MXB) += mxb.o
obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
diff --git a/drivers/staging/tm6000/Kconfig b/drivers/media/video/tm6000/Kconfig
similarity index 100%
rename from drivers/staging/tm6000/Kconfig
rename to drivers/media/video/tm6000/Kconfig
diff --git a/drivers/staging/tm6000/Makefile b/drivers/media/video/tm6000/Makefile
similarity index 100%
rename from drivers/staging/tm6000/Makefile
rename to drivers/media/video/tm6000/Makefile
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/media/video/tm6000/tm6000-alsa.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-alsa.c
rename to drivers/media/video/tm6000/tm6000-alsa.c
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/media/video/tm6000/tm6000-cards.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-cards.c
rename to drivers/media/video/tm6000/tm6000-cards.c
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/media/video/tm6000/tm6000-core.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-core.c
rename to drivers/media/video/tm6000/tm6000-core.c
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/media/video/tm6000/tm6000-dvb.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-dvb.c
rename to drivers/media/video/tm6000/tm6000-dvb.c
diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/media/video/tm6000/tm6000-i2c.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-i2c.c
rename to drivers/media/video/tm6000/tm6000-i2c.c
diff --git a/drivers/staging/tm6000/tm6000-input.c b/drivers/media/video/tm6000/tm6000-input.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-input.c
rename to drivers/media/video/tm6000/tm6000-input.c
diff --git a/drivers/staging/tm6000/tm6000-regs.h b/drivers/media/video/tm6000/tm6000-regs.h
similarity index 100%
rename from drivers/staging/tm6000/tm6000-regs.h
rename to drivers/media/video/tm6000/tm6000-regs.h
diff --git a/drivers/staging/tm6000/tm6000-stds.c b/drivers/media/video/tm6000/tm6000-stds.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-stds.c
rename to drivers/media/video/tm6000/tm6000-stds.c
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/media/video/tm6000/tm6000-usb-isoc.h
similarity index 100%
rename from drivers/staging/tm6000/tm6000-usb-isoc.h
rename to drivers/media/video/tm6000/tm6000-usb-isoc.h
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c
similarity index 100%
rename from drivers/staging/tm6000/tm6000-video.c
rename to drivers/media/video/tm6000/tm6000-video.c
diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/media/video/tm6000/tm6000.h
similarity index 100%
rename from drivers/staging/tm6000/tm6000.h
rename to drivers/media/video/tm6000/tm6000.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 06c9081d596d..720927742eb7 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -32,8 +32,6 @@ source "drivers/staging/go7007/Kconfig"
source "drivers/staging/cx25821/Kconfig"
-source "drivers/staging/tm6000/Kconfig"
-
source "drivers/staging/cxd2099/Kconfig"
source "drivers/staging/usbip/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index f3c5e33bb263..d44d25ed6cf1 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS) += slicoss/
obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_VIDEO_CX25821) += cx25821/
-obj-$(CONFIG_VIDEO_TM6000) += tm6000/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
obj-$(CONFIG_LIRC_STAGING) += lirc/
obj-$(CONFIG_USBIP_CORE) += usbip/
diff --git a/drivers/staging/tm6000/README b/drivers/staging/tm6000/README
deleted file mode 100644
index c340ebc2ee9f..000000000000
--- a/drivers/staging/tm6000/README
+++ /dev/null
@@ -1,22 +0,0 @@
-Todo:
- - Fix the loss of some blocks when receiving the video URB's
- - Add a lock at tm6000_read_write_usb() to prevent two simultaneous access to the
- URB control transfers
- - Properly add the locks at tm6000-video
- - Add audio support
- - Add vbi support
- - Add IR support
- - Do several cleanups
- - I think that frame1/frame0 are inverted. This causes a funny effect at the image.
- the fix is trivial, but require some tests
- - My tm6010 devices sometimes insist on stop working. I need to turn them off, removing
- from my machine and wait for a while for it to work again. I'm starting to think that
- it is an overheat issue - is there a workaround that we could do?
- - Sometimes, tm6010 doesn't read eeprom at the proper time (hardware bug). So, the device
- got miss-detected as a "generic" tm6000. This can be really bad if the tuner is the
- Low Power one, as it may result on loading the high power firmware, that could damage
- the device. Maybe we may read eeprom to double check, when the device is marked as "generic"
- - Coding Style fixes
- - sparse cleanups
-
-Please send patches to linux-media@vger.kernel.org
diff --git a/drivers/staging/tm6000/TODO b/drivers/staging/tm6000/TODO
deleted file mode 100644
index 135d0ea3ad70..000000000000
--- a/drivers/staging/tm6000/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-There a few things to do before putting this driver in production:
- - IR NEC with tm5600/6000 TV cards
- - IR RC5 with tm5600/6000/6010 TV cards
- - CodingStyle;
- - Fix audio;
- - Fix some panic/OOPS conditions.
-
-Please send patches to linux-media@vger.kernel.org
--
GitLab