Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae69b22c authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by Greg Kroah-Hartman
Browse files

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: default avatarKrzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 43d1136d

drivers/staging/solo6x10/Makefile

+1 −4
Original line number Diff line number Diff line 
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

drivers/staging/solo6x10/solo6010-core.c→drivers/staging/solo6x10/core.c

+2 −3
Original line number Diff line number Diff line
@@ -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>");

drivers/staging/solo6x10/solo6010-disp.c→drivers/staging/solo6x10/disp.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/solo6x10/solo6010-enc.c→drivers/staging/solo6x10/enc.c

+2 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/solo6x10/solo6010-g723.c→drivers/staging/solo6x10/g723.c

+2 −4
Original line number Diff line number Diff line
@@ -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