[media] cx25821: remove bogus dependencies
This driver doesn't use DVB, RC, cx25840 or tveeprom. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
de9ea4cf7f
Коммит
89c21389f2
|
@ -1,14 +1,9 @@
|
||||||
config VIDEO_CX25821
|
config VIDEO_CX25821
|
||||||
tristate "Conexant cx25821 support"
|
tristate "Conexant cx25821 support"
|
||||||
depends on DVB_CORE && VIDEO_DEV && PCI && I2C
|
depends on VIDEO_DEV && PCI && I2C
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select VIDEO_BTCX
|
select VIDEO_BTCX
|
||||||
select VIDEO_TVEEPROM
|
|
||||||
depends on RC_CORE
|
|
||||||
select VIDEOBUF_DVB
|
|
||||||
select VIDEOBUF_DMA_SG
|
select VIDEOBUF_DMA_SG
|
||||||
select VIDEO_CX25840
|
|
||||||
select VIDEO_CX2341X
|
|
||||||
---help---
|
---help---
|
||||||
This is a video4linux driver for Conexant 25821 based
|
This is a video4linux driver for Conexant 25821 based
|
||||||
TV cards.
|
TV cards.
|
||||||
|
|
|
@ -9,6 +9,3 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
|
||||||
|
|
||||||
ccflags-y += -Idrivers/media/i2c
|
ccflags-y += -Idrivers/media/i2c
|
||||||
ccflags-y += -Idrivers/media/common
|
ccflags-y += -Idrivers/media/common
|
||||||
ccflags-y += -Idrivers/media/tuners
|
|
||||||
ccflags-y += -Idrivers/media/dvb-core
|
|
||||||
ccflags-y += -Idrivers/media/dvb-frontends
|
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/delay.h>
|
|
||||||
#include <media/cx25840.h>
|
|
||||||
|
|
||||||
#include "cx25821.h"
|
#include "cx25821.h"
|
||||||
|
|
||||||
|
@ -50,22 +48,3 @@ struct cx25821_board cx25821_boards[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
|
const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
|
||||||
|
|
||||||
struct cx25821_subid cx25821_subids[] = {
|
|
||||||
{
|
|
||||||
.subvendor = 0x14f1,
|
|
||||||
.subdevice = 0x0920,
|
|
||||||
.card = CX25821_BOARD,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
void cx25821_card_setup(struct cx25821_dev *dev)
|
|
||||||
{
|
|
||||||
static u8 eeprom[256];
|
|
||||||
|
|
||||||
if (dev->i2c_bus[0].i2c_rc == 0) {
|
|
||||||
dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
|
|
||||||
tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
|
|
||||||
sizeof(eeprom));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -953,8 +953,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
|
||||||
CX25821_INFO("i2c register! bus->i2c_rc = %d\n",
|
CX25821_INFO("i2c register! bus->i2c_rc = %d\n",
|
||||||
dev->i2c_bus[0].i2c_rc);
|
dev->i2c_bus[0].i2c_rc);
|
||||||
|
|
||||||
cx25821_card_setup(dev);
|
|
||||||
|
|
||||||
if (medusa_video_init(dev) < 0)
|
if (medusa_video_init(dev) < 0)
|
||||||
CX25821_ERR("%s(): Failed to initialize medusa!\n", __func__);
|
CX25821_ERR("%s(): Failed to initialize medusa!\n", __func__);
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
#include "cx25821.h"
|
#include "cx25821.h"
|
||||||
|
|
||||||
/********************* GPIO stuffs *********************/
|
/********************* GPIO stuffs *********************/
|
||||||
|
|
|
@ -23,8 +23,9 @@
|
||||||
|
|
||||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
#include "cx25821.h"
|
#include <linux/module.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
|
#include "cx25821.h"
|
||||||
|
|
||||||
static unsigned int i2c_debug;
|
static unsigned int i2c_debug;
|
||||||
module_param(i2c_debug, int, 0644);
|
module_param(i2c_debug, int, 0644);
|
||||||
|
|
|
@ -33,9 +33,7 @@
|
||||||
|
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/v4l2-device.h>
|
#include <media/v4l2-device.h>
|
||||||
#include <media/tveeprom.h>
|
|
||||||
#include <media/videobuf-dma-sg.h>
|
#include <media/videobuf-dma-sg.h>
|
||||||
#include <media/videobuf-dvb.h>
|
|
||||||
|
|
||||||
#include "btcx-risc.h"
|
#include "btcx-risc.h"
|
||||||
#include "cx25821-reg.h"
|
#include "cx25821-reg.h"
|
||||||
|
@ -178,12 +176,6 @@ struct cx25821_board {
|
||||||
struct cx25821_input input[CX25821_NR_INPUT];
|
struct cx25821_input input[CX25821_NR_INPUT];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct cx25821_subid {
|
|
||||||
u16 subvendor;
|
|
||||||
u16 subdevice;
|
|
||||||
u32 card;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct cx25821_i2c {
|
struct cx25821_i2c {
|
||||||
struct cx25821_dev *dev;
|
struct cx25821_dev *dev;
|
||||||
|
|
||||||
|
@ -406,7 +398,6 @@ static inline struct cx25821_dev *get_cx25821(struct v4l2_device *v4l2_dev)
|
||||||
v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args)
|
v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args)
|
||||||
|
|
||||||
extern struct cx25821_board cx25821_boards[];
|
extern struct cx25821_board cx25821_boards[];
|
||||||
extern struct cx25821_subid cx25821_subids[];
|
|
||||||
|
|
||||||
#define SRAM_CH00 0 /* Video A */
|
#define SRAM_CH00 0 /* Video A */
|
||||||
#define SRAM_CH01 1 /* Video B */
|
#define SRAM_CH01 1 /* Video B */
|
||||||
|
@ -487,8 +478,6 @@ extern const struct sram_channel cx25821_sram_channels[];
|
||||||
pr_info("(%d): " fmt, dev->board, ##args)
|
pr_info("(%d): " fmt, dev->board, ##args)
|
||||||
|
|
||||||
extern int cx25821_i2c_register(struct cx25821_i2c *bus);
|
extern int cx25821_i2c_register(struct cx25821_i2c *bus);
|
||||||
extern void cx25821_card_setup(struct cx25821_dev *dev);
|
|
||||||
extern int cx25821_ir_init(struct cx25821_dev *dev);
|
|
||||||
extern int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value);
|
extern int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value);
|
||||||
extern int cx25821_i2c_write(struct cx25821_i2c *bus, u16 reg_addr, int value);
|
extern int cx25821_i2c_write(struct cx25821_i2c *bus, u16 reg_addr, int value);
|
||||||
extern int cx25821_i2c_unregister(struct cx25821_i2c *bus);
|
extern int cx25821_i2c_unregister(struct cx25821_i2c *bus);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче