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>
This commit is contained in:
parent
43d1136d2c
commit
ae69b22c6c
|
@ -1,6 +1,3 @@
|
||||||
solo6x10-y := solo6010-core.o solo6010-i2c.o solo6010-p2m.o \
|
solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o
|
||||||
solo6010-v4l2.o solo6010-tw28.o solo6010-gpio.o \
|
|
||||||
solo6010-disp.o solo6010-enc.o solo6010-v4l2-enc.o \
|
|
||||||
solo6010-g723.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_SOLO6X10) := solo6x10.o
|
obj-$(CONFIG_SOLO6X10) := solo6x10.o
|
||||||
|
|
|
@ -22,9 +22,8 @@
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "tw28.h"
|
||||||
#include "solo6010-tw28.h"
|
|
||||||
|
|
||||||
MODULE_DESCRIPTION("Softlogic 6010 MP4 Encoder/Decoder V4L2/ALSA Driver");
|
MODULE_DESCRIPTION("Softlogic 6010 MP4 Encoder/Decoder V4L2/ALSA Driver");
|
||||||
MODULE_AUTHOR("Ben Collins <bcollins@bluecherry.net>");
|
MODULE_AUTHOR("Ben Collins <bcollins@bluecherry.net>");
|
|
@ -21,8 +21,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
|
||||||
|
|
||||||
#define SOLO_VCLK_DELAY 3
|
#define SOLO_VCLK_DELAY 3
|
||||||
#define SOLO_PROGRESSIVE_VSIZE 1024
|
#define SOLO_PROGRESSIVE_VSIZE 1024
|
|
@ -18,9 +18,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "osd-font.h"
|
||||||
#include "solo6010-osd-font.h"
|
|
||||||
|
|
||||||
#define CAPTURE_MAX_BANDWIDTH 32 /* D1 4channel (D1 == 4) */
|
#define CAPTURE_MAX_BANDWIDTH 32 /* D1 4channel (D1 == 4) */
|
||||||
#define OSG_BUFFER_SIZE 1024
|
#define OSG_BUFFER_SIZE 1024
|
|
@ -22,14 +22,12 @@
|
||||||
#include <linux/poll.h>
|
#include <linux/poll.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
|
|
||||||
#include <sound/core.h>
|
#include <sound/core.h>
|
||||||
#include <sound/initval.h>
|
#include <sound/initval.h>
|
||||||
#include <sound/pcm.h>
|
#include <sound/pcm.h>
|
||||||
#include <sound/control.h>
|
#include <sound/control.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "tw28.h"
|
||||||
#include "solo6010-tw28.h"
|
|
||||||
|
|
||||||
#define G723_INTR_ORDER 0
|
#define G723_INTR_ORDER 0
|
||||||
#define G723_FDMA_PAGES 32
|
#define G723_FDMA_PAGES 32
|
|
@ -20,8 +20,7 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
|
||||||
|
|
||||||
static void solo_gpio_mode(struct solo6010_dev *solo_dev,
|
static void solo_gpio_mode(struct solo6010_dev *solo_dev,
|
||||||
unsigned int port_mask, unsigned int mode)
|
unsigned int port_mask, unsigned int mode)
|
|
@ -26,8 +26,7 @@
|
||||||
* thread context, ACK the interrupt, and move on. -- BenC */
|
* thread context, ACK the interrupt, and move on. -- BenC */
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
|
||||||
|
|
||||||
u8 solo_i2c_readbyte(struct solo6010_dev *solo_dev, int id, u8 addr, u8 off)
|
u8 solo_i2c_readbyte(struct solo6010_dev *solo_dev, int id, u8 addr, u8 off)
|
||||||
{
|
{
|
|
@ -19,8 +19,7 @@
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/scatterlist.h>
|
#include <linux/scatterlist.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
|
||||||
|
|
||||||
/* #define SOLO_TEST_P2M */
|
/* #define SOLO_TEST_P2M */
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef __SOLO6010_REGISTERS_H
|
#ifndef __SOLO6010_REGISTERS_H
|
||||||
#define __SOLO6010_REGISTERS_H
|
#define __SOLO6010_REGISTERS_H
|
||||||
|
|
||||||
#include "solo6010-offsets.h"
|
#include "offsets.h"
|
||||||
|
|
||||||
/* Global 6010 system configuration */
|
/* Global 6010 system configuration */
|
||||||
#define SOLO_SYS_CFG 0x0000
|
#define SOLO_SYS_CFG 0x0000
|
|
@ -30,12 +30,10 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
|
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
#include <media/v4l2-dev.h>
|
#include <media/v4l2-dev.h>
|
||||||
#include <media/videobuf-core.h>
|
#include <media/videobuf-core.h>
|
||||||
|
#include "registers.h"
|
||||||
#include "solo6010-registers.h"
|
|
||||||
|
|
||||||
#ifndef PCI_VENDOR_ID_SOFTLOGIC
|
#ifndef PCI_VENDOR_ID_SOFTLOGIC
|
||||||
#define PCI_VENDOR_ID_SOFTLOGIC 0x9413
|
#define PCI_VENDOR_ID_SOFTLOGIC 0x9413
|
|
@ -18,9 +18,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "tw28.h"
|
||||||
#include "solo6010-tw28.h"
|
|
||||||
|
|
||||||
/* XXX: Some of these values are masked into an 8-bit regs, and shifted
|
/* XXX: Some of these values are masked into an 8-bit regs, and shifted
|
||||||
* around for other 8-bit regs. What are the magic bits in these values? */
|
* around for other 8-bit regs. What are the magic bits in these values? */
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef __SOLO6010_TW28_H
|
#ifndef __SOLO6010_TW28_H
|
||||||
#define __SOLO6010_TW28_H
|
#define __SOLO6010_TW28_H
|
||||||
|
|
||||||
#include "solo6010.h"
|
#include "solo6x10.h"
|
||||||
|
|
||||||
#define TW_NUM_CHIP 4
|
#define TW_NUM_CHIP 4
|
||||||
#define TW_BASE_ADDR 0x28
|
#define TW_BASE_ADDR 0x28
|
|
@ -21,14 +21,12 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
|
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/videobuf-dma-sg.h>
|
#include <media/videobuf-dma-sg.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "tw28.h"
|
||||||
#include "solo6010-tw28.h"
|
#include "jpeg.h"
|
||||||
#include "solo6010-jpeg.h"
|
|
||||||
|
|
||||||
#define MIN_VID_BUFFERS 4
|
#define MIN_VID_BUFFERS 4
|
||||||
#define FRAME_BUF_SIZE (128 * 1024)
|
#define FRAME_BUF_SIZE (128 * 1024)
|
|
@ -21,13 +21,11 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
|
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/videobuf-dma-sg.h>
|
#include <media/videobuf-dma-sg.h>
|
||||||
|
#include "solo6x10.h"
|
||||||
#include "solo6010.h"
|
#include "tw28.h"
|
||||||
#include "solo6010-tw28.h"
|
|
||||||
|
|
||||||
#define SOLO_HW_BPL 2048
|
#define SOLO_HW_BPL 2048
|
||||||
#define SOLO_DISP_PIX_FIELD V4L2_FIELD_INTERLACED
|
#define SOLO_DISP_PIX_FIELD V4L2_FIELD_INTERLACED
|
Loading…
Reference in New Issue