Commit Graph

25 Commits

Author SHA1 Message Date
Krzysztof Hałasa
decebabf24 staging: Solo6x10: Changed solo6010* -> solo*, solo6x10* etc.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:04 -08:00
Krzysztof Hałasa
ae69b22c6c staging: Solo6x10: Stripped "solo6010-" from file names.
This driver supports both Solo-6010 and Solo-6110 chips anyway.
Renamed solo6010.h -> solo6x10.h.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:04 -08:00
Krzysztof Hałasa
43d1136d2c staging: Solo6x10: remove unneeded __solo parameter from SOLO_*_EXT_ADDR macros.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:04 -08:00
Krzysztof Hałasa
908113d8eb staging: Solo6x10: Add support for SOLO6110 chip.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:03 -08:00
Krzysztof Hałasa
856e22d3cd staging: Solo6x10: Align MPEG video on 8-byte boundary instead of 32-byte.
Solo-6110 only supports 8-byte alignment anyway.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:03 -08:00
Krzysztof Hałasa
c55564fdf7 staging: Solo6x10: Build MPEG4 headers on the fly.
This will make them maintainable. Also, it now works on big-endian systems.

This is the slow path (done every 1+ second, per channel) so I guess
there is no need to cache the results.

I have removed CBR-related bits from the MPEG4 VOL header since we can't
do CBR (at least yet).

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:02 -08:00
Krzysztof Hałasa
98ab1c9978 staging: Solo6x10: accept WxH >= screen dimentions.
This makes it possible to request full resolution (704x576 or 704x480)
independently of the color system used (PAL or NTSC).

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:37:02 -08:00
Randy Dunlap
372058f1b4 staging: solo6010 depends on I2C
This driver uses i2c interfaces, so it should depend on I2C
(unless someone wants to break it into pieces or make it more
config-dependent).

drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer'
drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter'
drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-09 16:29:49 -08:00
facugaich
afabbe6db3 Staging: solo6x10: Fix checkpatch errors and most warnings
This patch fixes all errors and most warnings reported by
checkpatch.pl for all the files in the driver.
v2: Fix a typo and update the patch against the latest HEAD

Signed-off-by: Facundo Gaich <facugaich@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-10 16:28:30 -08:00
Ben Collins
5bf68592e7 solo6x10: [P2M] Fix memory leak
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-08 10:07:42 -05:00
Ben Collins
0e4de059d9 solo6x10: Implement working P2M descriptor more DMA
We have to insert 1 dead descriptor first (all zereos), and then the real
data descriptors after that.

Everything uses descriptor mode now (8800 interrupts per second for display
v4l2 is now down to ~96).

Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-05 10:29:33 -04:00
Ben Collins
319fb3bacc solo6x10: Updates to videobuf-dma-sg functions for latest kernel
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-04 23:20:31 -04:00
Ben Collins
f62de9be26 solo6x10: Conversion to videobuf-dma-sg (from dma-cont)
Full rewrite of the P2M DMA Engine to support scatter gather and take
advantage of some of the features of the hardware. This includes using
repeat DMA operations and line-mode transfers (for copying OSG and
video display buffers).

What isn't working: For some reason, descriptor mode is not working. I've
implemented a psuedo version (still has one-interrupt per DMA operation),
but we would get huge improvements if we could hand off a ring of
descriptors to the P2M and get back one interrupt when it was done with
all of them.

Documentation is very vague on this, and even the ODM example code
half attempts to get it right, but comments it out of the driver
because it just doesn't work *sigh*

Converts all v4l2 to dma-sg. So long slow dma-contiguous, but hello
more interrupts :(

Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-04 22:51:17 -04:00
Ben Collins
1194cf4308 solo6x10: Update TODO
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-04 22:42:25 -04:00
Ben Collins
98e2d5a802 solo6x10: Spaces to tabs
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
2010-11-04 22:37:15 -04:00
Tracey Dent
783098ea41 Staging: solo6x10: Makefile: replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 07:23:43 -07:00
Vasiliy Kulikov
3850a8ae43 staging: solo6010: fix signess bug
video_nr is unsigned, so check video_nr >= 0 doesn't make sense.
The only "negative" value may be -1, so explicitly check for it.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-16 12:37:33 -07:00
Thomas Gleixner
0f0800f17a staging: Bulk convert the semaphore mess
init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert
staging users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-07 19:31:32 -07:00
Prashant P. Shah
15300c1df7 Staging: solo6x10: fixed assignments in if conditions in solo6010-core.c
This is a patch to the solo6010-core.c file that fixes the assignments
in if condition style issues found by the checkpatch.pl tool.

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 15:22:37 -07:00
Dan Carpenter
6a4ca03992 Staging: solo6x10: return -EFAULT on copy_to_user errors
copy_to_user() returns the number of bytes remaining to be copied, but
we want to return a negative error code here.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:51:53 -07:00
Randy Dunlap
af6d2b2a3d Staging: solo: add delay.h header
Several solo drivers need <linux/delay.h>, so add it to the
private solo6010.h header file.

drivers/staging/solo6x10/solo6010-core.c:191: error: implicit declaration of function 'mdelay'
drivers/staging/solo6x10/solo6010-tw28.c:181: error: implicit declaration of function 'msleep_interruptible'
drivers/staging/solo6x10/solo6010-gpio.c:78: error: implicit declaration of function 'udelay'
drivers/staging/solo6x10/solo6010-v4l2-enc.c:254: error: implicit declaration of function 'mdelay'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
2010-07-08 13:57:58 -07:00
Randy Dunlap
4d8152be18 Staging: solo: depends on SND
Fix 56 undefined references to snd_*() functions. First 5 are:

drivers/built-in.o: In function `solo_g723_exit':
(.text+0xa4a4aa): undefined reference to `snd_card_free'
drivers/built-in.o: In function `solo_snd_pcm_init':
solo6010-g723.c:(.text+0xa4a677): undefined reference to `snd_pcm_new'
solo6010-g723.c:(.text+0xa4a6b1): undefined reference to `snd_pcm_set_ops'
solo6010-g723.c:(.text+0xa4a74d): undefined reference to `snd_pcm_lib_preallocate_pages_for_all'
drivers/built-in.o: In function `solo_g723_init':
(.text+0xa4a7f6): undefined reference to `snd_card_create'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-25 11:11:23 -07:00
Ben Collins
054fa2267d Staging: solo6x10: Add TODO
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-23 15:20:20 -07:00
Ben Collins
ee6351f56a Staging: solo6x10: Support for tw2865 in cascade/full modes
Finally got ahold of a card with a tw2865 video/audio multiplexer and
the spec sheet to go along with it.

Signed-off-by: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-23 15:20:20 -07:00
Ben Collins
faa4fd2a09 Staging: solo6x10: New driver (staging) for Softlogic 6x10
This driver supports Softlogic 6x10 based codec cards

Signed-off-by: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 15:57:44 -07:00