diff options
author | Krzysztof Hałasa <khalasa@piap.pl> | 2011-02-11 12:36:27 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 20:37:04 (GMT) |
commit | ae69b22c6ca7d1d7fdccf0b664dafbc777099abe (patch) | |
tree | b239fd4acd63d4f5943f004c649ba25d13c80158 /drivers | |
parent | 43d1136d2c6073709db3049b3661ee662911df35 (diff) | |
download | linux-fsl-qoriq-ae69b22c6ca7d1d7fdccf0b664dafbc777099abe.tar.xz |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/solo6x10/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/solo6x10/core.c (renamed from drivers/staging/solo6x10/solo6010-core.c) | 5 | ||||
-rw-r--r-- | drivers/staging/solo6x10/disp.c (renamed from drivers/staging/solo6x10/solo6010-disp.c) | 3 | ||||
-rw-r--r-- | drivers/staging/solo6x10/enc.c (renamed from drivers/staging/solo6x10/solo6010-enc.c) | 5 | ||||
-rw-r--r-- | drivers/staging/solo6x10/g723.c (renamed from drivers/staging/solo6x10/solo6010-g723.c) | 6 | ||||
-rw-r--r-- | drivers/staging/solo6x10/gpio.c (renamed from drivers/staging/solo6x10/solo6010-gpio.c) | 3 | ||||
-rw-r--r-- | drivers/staging/solo6x10/i2c.c (renamed from drivers/staging/solo6x10/solo6010-i2c.c) | 3 | ||||
-rw-r--r-- | drivers/staging/solo6x10/jpeg.h (renamed from drivers/staging/solo6x10/solo6010-jpeg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/solo6x10/offsets.h (renamed from drivers/staging/solo6x10/solo6010-offsets.h) | 0 | ||||
-rw-r--r-- | drivers/staging/solo6x10/osd-font.h (renamed from drivers/staging/solo6x10/solo6010-osd-font.h) | 0 | ||||
-rw-r--r-- | drivers/staging/solo6x10/p2m.c (renamed from drivers/staging/solo6x10/solo6010-p2m.c) | 3 | ||||
-rw-r--r-- | drivers/staging/solo6x10/registers.h (renamed from drivers/staging/solo6x10/solo6010-registers.h) | 2 | ||||
-rw-r--r-- | drivers/staging/solo6x10/solo6x10.h (renamed from drivers/staging/solo6x10/solo6010.h) | 4 | ||||
-rw-r--r-- | drivers/staging/solo6x10/tw28.c (renamed from drivers/staging/solo6x10/solo6010-tw28.c) | 5 | ||||
-rw-r--r-- | drivers/staging/solo6x10/tw28.h (renamed from drivers/staging/solo6x10/solo6010-tw28.h) | 2 | ||||
-rw-r--r-- | drivers/staging/solo6x10/v4l2-enc.c (renamed from drivers/staging/solo6x10/solo6010-v4l2-enc.c) | 8 | ||||
-rw-r--r-- | drivers/staging/solo6x10/v4l2.c (renamed from drivers/staging/solo6x10/solo6010-v4l2.c) | 6 |
17 files changed, 21 insertions, 39 deletions
diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/solo6x10/Makefile index 1616b55..72816cf 100644 --- a/drivers/staging/solo6x10/Makefile +++ b/drivers/staging/solo6x10/Makefile @@ -1,6 +1,3 @@ -solo6x10-y := solo6010-core.o solo6010-i2c.o solo6010-p2m.o \ - solo6010-v4l2.o solo6010-tw28.o solo6010-gpio.o \ - solo6010-disp.o solo6010-enc.o solo6010-v4l2-enc.o \ - solo6010-g723.o +solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o obj-$(CONFIG_SOLO6X10) := solo6x10.o diff --git a/drivers/staging/solo6x10/solo6010-core.c b/drivers/staging/solo6x10/core.c index c713a74..37e6fda 100644 --- a/drivers/staging/solo6x10/solo6010-core.c +++ b/drivers/staging/solo6x10/core.c @@ -22,9 +22,8 @@ #include <linux/pci.h> #include <linux/interrupt.h> #include <linux/videodev2.h> - -#include "solo6010.h" -#include "solo6010-tw28.h" +#include "solo6x10.h" +#include "tw28.h" MODULE_DESCRIPTION("Softlogic 6010 MP4 Encoder/Decoder V4L2/ALSA Driver"); MODULE_AUTHOR("Ben Collins <bcollins@bluecherry.net>"); diff --git a/drivers/staging/solo6x10/solo6010-disp.c b/drivers/staging/solo6x10/disp.c index 99d1461..1b0cfa8 100644 --- a/drivers/staging/solo6x10/solo6010-disp.c +++ b/drivers/staging/solo6x10/disp.c @@ -21,8 +21,7 @@ #include <linux/module.h> #include <linux/videodev2.h> #include <media/v4l2-ioctl.h> - -#include "solo6010.h" +#include "solo6x10.h" #define SOLO_VCLK_DELAY 3 #define SOLO_PROGRESSIVE_VSIZE 1024 diff --git a/drivers/staging/solo6x10/solo6010-enc.c b/drivers/staging/solo6x10/enc.c index 7a3c4d5..755626c 100644 --- a/drivers/staging/solo6x10/solo6010-enc.c +++ b/drivers/staging/solo6x10/enc.c @@ -18,9 +18,8 @@ */ #include <linux/kernel.h> - -#include "solo6010.h" -#include "solo6010-osd-font.h" +#include "solo6x10.h" +#include "osd-font.h" #define CAPTURE_MAX_BANDWIDTH 32 /* D1 4channel (D1 == 4) */ #define OSG_BUFFER_SIZE 1024 diff --git a/drivers/staging/solo6x10/solo6010-g723.c b/drivers/staging/solo6x10/g723.c index 254b46a..4aba8f3 100644 --- a/drivers/staging/solo6x10/solo6010-g723.c +++ b/drivers/staging/solo6x10/g723.c @@ -22,14 +22,12 @@ #include <linux/poll.h> #include <linux/kthread.h> #include <linux/freezer.h> - #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h> #include <sound/control.h> - -#include "solo6010.h" -#include "solo6010-tw28.h" +#include "solo6x10.h" +#include "tw28.h" #define G723_INTR_ORDER 0 #define G723_FDMA_PAGES 32 diff --git a/drivers/staging/solo6x10/solo6010-gpio.c b/drivers/staging/solo6x10/gpio.c index 8869b88..efd88ba 100644 --- a/drivers/staging/solo6x10/solo6010-gpio.c +++ b/drivers/staging/solo6x10/gpio.c @@ -20,8 +20,7 @@ #include <linux/kernel.h> #include <linux/fs.h> #include <asm/uaccess.h> - -#include "solo6010.h" +#include "solo6x10.h" static void solo_gpio_mode(struct solo6010_dev *solo_dev, unsigned int port_mask, unsigned int mode) diff --git a/drivers/staging/solo6x10/solo6010-i2c.c b/drivers/staging/solo6x10/i2c.c index 60b69cd..fba4247 100644 --- a/drivers/staging/solo6x10/solo6010-i2c.c +++ b/drivers/staging/solo6x10/i2c.c @@ -26,8 +26,7 @@ * thread context, ACK the interrupt, and move on. -- BenC */ #include <linux/kernel.h> - -#include "solo6010.h" +#include "solo6x10.h" u8 solo_i2c_readbyte(struct solo6010_dev *solo_dev, int id, u8 addr, u8 off) { diff --git a/drivers/staging/solo6x10/solo6010-jpeg.h b/drivers/staging/solo6x10/jpeg.h index fb0507e..fb0507e 100644 --- a/drivers/staging/solo6x10/solo6010-jpeg.h +++ b/drivers/staging/solo6x10/jpeg.h diff --git a/drivers/staging/solo6x10/solo6010-offsets.h b/drivers/staging/solo6x10/offsets.h index b176003..b176003 100644 --- a/drivers/staging/solo6x10/solo6010-offsets.h +++ b/drivers/staging/solo6x10/offsets.h diff --git a/drivers/staging/solo6x10/solo6010-osd-font.h b/drivers/staging/solo6x10/osd-font.h index d72efbb..d72efbb 100644 --- a/drivers/staging/solo6x10/solo6010-osd-font.h +++ b/drivers/staging/solo6x10/osd-font.h diff --git a/drivers/staging/solo6x10/solo6010-p2m.c b/drivers/staging/solo6x10/p2m.c index 90de963..1b88d10 100644 --- a/drivers/staging/solo6x10/solo6010-p2m.c +++ b/drivers/staging/solo6x10/p2m.c @@ -19,8 +19,7 @@ #include <linux/kernel.h> #include <linux/scatterlist.h> - -#include "solo6010.h" +#include "solo6x10.h" /* #define SOLO_TEST_P2M */ diff --git a/drivers/staging/solo6x10/solo6010-registers.h b/drivers/staging/solo6x10/registers.h index db291bf..edf77e8 100644 --- a/drivers/staging/solo6x10/solo6010-registers.h +++ b/drivers/staging/solo6x10/registers.h @@ -20,7 +20,7 @@ #ifndef __SOLO6010_REGISTERS_H #define __SOLO6010_REGISTERS_H -#include "solo6010-offsets.h" +#include "offsets.h" /* Global 6010 system configuration */ #define SOLO_SYS_CFG 0x0000 diff --git a/drivers/staging/solo6x10/solo6010.h b/drivers/staging/solo6x10/solo6x10.h index 4532e12..1730f4d 100644 --- a/drivers/staging/solo6x10/solo6010.h +++ b/drivers/staging/solo6x10/solo6x10.h @@ -30,12 +30,10 @@ #include <linux/delay.h> #include <asm/io.h> #include <asm/atomic.h> - #include <linux/videodev2.h> #include <media/v4l2-dev.h> #include <media/videobuf-core.h> - -#include "solo6010-registers.h" +#include "registers.h" #ifndef PCI_VENDOR_ID_SOFTLOGIC #define PCI_VENDOR_ID_SOFTLOGIC 0x9413 diff --git a/drivers/staging/solo6x10/solo6010-tw28.c b/drivers/staging/solo6x10/tw28.c index 905a6ad..0f3d1e4 100644 --- a/drivers/staging/solo6x10/solo6010-tw28.c +++ b/drivers/staging/solo6x10/tw28.c @@ -18,9 +18,8 @@ */ #include <linux/kernel.h> - -#include "solo6010.h" -#include "solo6010-tw28.h" +#include "solo6x10.h" +#include "tw28.h" /* 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? */ diff --git a/drivers/staging/solo6x10/solo6010-tw28.h b/drivers/staging/solo6x10/tw28.h index a7eecfa..4862ac9 100644 --- a/drivers/staging/solo6x10/solo6010-tw28.h +++ b/drivers/staging/solo6x10/tw28.h @@ -20,7 +20,7 @@ #ifndef __SOLO6010_TW28_H #define __SOLO6010_TW28_H -#include "solo6010.h" +#include "solo6x10.h" #define TW_NUM_CHIP 4 #define TW_BASE_ADDR 0x28 diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/v4l2-enc.c index 6fbd50e..b881923 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/drivers/staging/solo6x10/v4l2-enc.c @@ -21,14 +21,12 @@ #include <linux/module.h> #include <linux/kthread.h> #include <linux/freezer.h> - #include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> #include <media/videobuf-dma-sg.h> - -#include "solo6010.h" -#include "solo6010-tw28.h" -#include "solo6010-jpeg.h" +#include "solo6x10.h" +#include "tw28.h" +#include "jpeg.h" #define MIN_VID_BUFFERS 4 #define FRAME_BUF_SIZE (128 * 1024) diff --git a/drivers/staging/solo6x10/solo6010-v4l2.c b/drivers/staging/solo6x10/v4l2.c index 4e24e92..e9d620a 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2.c +++ b/drivers/staging/solo6x10/v4l2.c @@ -21,13 +21,11 @@ #include <linux/module.h> #include <linux/kthread.h> #include <linux/freezer.h> - #include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> #include <media/videobuf-dma-sg.h> - -#include "solo6010.h" -#include "solo6010-tw28.h" +#include "solo6x10.h" +#include "tw28.h" #define SOLO_HW_BPL 2048 #define SOLO_DISP_PIX_FIELD V4L2_FIELD_INTERLACED |