From ae69b22c6ca7d1d7fdccf0b664dafbc777099abe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Krzysztof=20Ha=C5=82asa?= Date: Fri, 11 Feb 2011 13:36:27 +0100 Subject: [PATCH] staging: Solo6x10: Stripped "solo6010-" from file names. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This driver supports both Solo-6010 and Solo-6110 chips anyway. Renamed solo6010.h -> solo6x10.h. Signed-off-by: Krzysztof Hałasa Signed-off-by: Greg Kroah-Hartman --- drivers/staging/solo6x10/Makefile | 5 +---- drivers/staging/solo6x10/{solo6010-core.c => core.c} | 5 ++--- drivers/staging/solo6x10/{solo6010-disp.c => disp.c} | 3 +-- drivers/staging/solo6x10/{solo6010-enc.c => enc.c} | 5 ++--- drivers/staging/solo6x10/{solo6010-g723.c => g723.c} | 6 ++---- drivers/staging/solo6x10/{solo6010-gpio.c => gpio.c} | 3 +-- drivers/staging/solo6x10/{solo6010-i2c.c => i2c.c} | 3 +-- drivers/staging/solo6x10/{solo6010-jpeg.h => jpeg.h} | 0 .../staging/solo6x10/{solo6010-offsets.h => offsets.h} | 0 .../staging/solo6x10/{solo6010-osd-font.h => osd-font.h} | 0 drivers/staging/solo6x10/{solo6010-p2m.c => p2m.c} | 3 +-- .../solo6x10/{solo6010-registers.h => registers.h} | 2 +- drivers/staging/solo6x10/{solo6010.h => solo6x10.h} | 4 +--- drivers/staging/solo6x10/{solo6010-tw28.c => tw28.c} | 5 ++--- drivers/staging/solo6x10/{solo6010-tw28.h => tw28.h} | 2 +- .../staging/solo6x10/{solo6010-v4l2-enc.c => v4l2-enc.c} | 8 +++----- drivers/staging/solo6x10/{solo6010-v4l2.c => v4l2.c} | 6 ++---- 17 files changed, 21 insertions(+), 39 deletions(-) rename drivers/staging/solo6x10/{solo6010-core.c => core.c} (99%) rename drivers/staging/solo6x10/{solo6010-disp.c => disp.c} (99%) rename drivers/staging/solo6x10/{solo6010-enc.c => enc.c} (99%) rename drivers/staging/solo6x10/{solo6010-g723.c => g723.c} (99%) rename drivers/staging/solo6x10/{solo6010-gpio.c => gpio.c} (99%) rename drivers/staging/solo6x10/{solo6010-i2c.c => i2c.c} (99%) rename drivers/staging/solo6x10/{solo6010-jpeg.h => jpeg.h} (100%) rename drivers/staging/solo6x10/{solo6010-offsets.h => offsets.h} (100%) rename drivers/staging/solo6x10/{solo6010-osd-font.h => osd-font.h} (100%) rename drivers/staging/solo6x10/{solo6010-p2m.c => p2m.c} (99%) rename drivers/staging/solo6x10/{solo6010-registers.h => registers.h} (99%) rename drivers/staging/solo6x10/{solo6010.h => solo6x10.h} (99%) rename drivers/staging/solo6x10/{solo6010-tw28.c => tw28.c} (99%) rename drivers/staging/solo6x10/{solo6010-tw28.h => tw28.h} (99%) rename drivers/staging/solo6x10/{solo6010-v4l2-enc.c => v4l2-enc.c} (99%) rename drivers/staging/solo6x10/{solo6010-v4l2.c => v4l2.c} (99%) diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/solo6x10/Makefile index 1616b5535474..72816cf16704 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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-core.c rename to drivers/staging/solo6x10/core.c index c713a74691dd..37e6fda626f3 100644 --- a/drivers/staging/solo6x10/solo6010-core.c +++ b/drivers/staging/solo6x10/core.c @@ -22,9 +22,8 @@ #include #include #include - -#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 "); diff --git a/drivers/staging/solo6x10/solo6010-disp.c b/drivers/staging/solo6x10/disp.c similarity index 99% rename from drivers/staging/solo6x10/solo6010-disp.c rename to drivers/staging/solo6x10/disp.c index 99d14619e784..1b0cfa8803eb 100644 --- a/drivers/staging/solo6x10/solo6010-disp.c +++ b/drivers/staging/solo6x10/disp.c @@ -21,8 +21,7 @@ #include #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-enc.c rename to drivers/staging/solo6x10/enc.c index 7a3c4d59e57c..755626c1a2ec 100644 --- a/drivers/staging/solo6x10/solo6010-enc.c +++ b/drivers/staging/solo6x10/enc.c @@ -18,9 +18,8 @@ */ #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-g723.c rename to drivers/staging/solo6x10/g723.c index 254b46ab20c5..4aba8f3dbe60 100644 --- a/drivers/staging/solo6x10/solo6010-g723.c +++ b/drivers/staging/solo6x10/g723.c @@ -22,14 +22,12 @@ #include #include #include - #include #include #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-gpio.c rename to drivers/staging/solo6x10/gpio.c index 8869b88dc307..efd88bafcdf6 100644 --- a/drivers/staging/solo6x10/solo6010-gpio.c +++ b/drivers/staging/solo6x10/gpio.c @@ -20,8 +20,7 @@ #include #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-i2c.c rename to drivers/staging/solo6x10/i2c.c index 60b69cd0d09d..fba424741c46 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 - -#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 similarity index 100% rename from drivers/staging/solo6x10/solo6010-jpeg.h rename to drivers/staging/solo6x10/jpeg.h diff --git a/drivers/staging/solo6x10/solo6010-offsets.h b/drivers/staging/solo6x10/offsets.h similarity index 100% rename from drivers/staging/solo6x10/solo6010-offsets.h rename to drivers/staging/solo6x10/offsets.h diff --git a/drivers/staging/solo6x10/solo6010-osd-font.h b/drivers/staging/solo6x10/osd-font.h similarity index 100% rename from drivers/staging/solo6x10/solo6010-osd-font.h rename to drivers/staging/solo6x10/osd-font.h diff --git a/drivers/staging/solo6x10/solo6010-p2m.c b/drivers/staging/solo6x10/p2m.c similarity index 99% rename from drivers/staging/solo6x10/solo6010-p2m.c rename to drivers/staging/solo6x10/p2m.c index 90de96348db8..1b88d1053f94 100644 --- a/drivers/staging/solo6x10/solo6010-p2m.c +++ b/drivers/staging/solo6x10/p2m.c @@ -19,8 +19,7 @@ #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-registers.h rename to drivers/staging/solo6x10/registers.h index db291bf0ce99..edf77e8a8e92 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 similarity index 99% rename from drivers/staging/solo6x10/solo6010.h rename to drivers/staging/solo6x10/solo6x10.h index 4532e12d91b5..1730f4d688d5 100644 --- a/drivers/staging/solo6x10/solo6010.h +++ b/drivers/staging/solo6x10/solo6x10.h @@ -30,12 +30,10 @@ #include #include #include - #include #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-tw28.c rename to drivers/staging/solo6x10/tw28.c index 905a6ad23a37..0f3d1e44c65a 100644 --- a/drivers/staging/solo6x10/solo6010-tw28.c +++ b/drivers/staging/solo6x10/tw28.c @@ -18,9 +18,8 @@ */ #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-tw28.h rename to drivers/staging/solo6x10/tw28.h index a7eecfa1a818..4862ac90dbd9 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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-v4l2-enc.c rename to drivers/staging/solo6x10/v4l2-enc.c index 6fbd50e90f63..b88192313112 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/drivers/staging/solo6x10/v4l2-enc.c @@ -21,14 +21,12 @@ #include #include #include - #include #include #include - -#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 similarity index 99% rename from drivers/staging/solo6x10/solo6010-v4l2.c rename to drivers/staging/solo6x10/v4l2.c index 4e24e928eb02..e9d620ab0417 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2.c +++ b/drivers/staging/solo6x10/v4l2.c @@ -21,13 +21,11 @@ #include #include #include - #include #include #include - -#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 -- 2.39.5