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

Commit 2e06d2ff authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8656): fix DVB_FE_CUSTOMISE for DVB_DIB7000P and DVB_TUNER_DIB0070 with dvb-usb-cxusb 



Allow dvb-usb-cxusb to be built without dib7000p or dib0070 selected

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a2dc86b6

drivers/media/dvb/dvb-usb/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ config DVB_USB_CXUSB 
	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE

	select DVB_DIB7000P

	select DVB_TUNER_DIB0070

	select DVB_DIB7000P if !DVB_FE_CUSTOMISE

	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the Conexant USB2.0 hybrid reference design.

	  Currently, only DVB and ATSC modes are supported, analog mode

drivers/media/dvb/frontends/dib0070.h

+7 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct dib0070_config { 
extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,

					   struct i2c_adapter *i2c,

					   struct dib0070_config *cfg);

extern u16 dib0070_wbd_offset(struct dvb_frontend *);

#else

static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,

						  struct i2c_adapter *i2c,
@@ -49,9 +50,14 @@ static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, 
	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}



static inline u16 dib0070_wbd_offset(struct dvb_frontend *fe)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return -ENODEV;

}

#endif



extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, uint8_t open);

extern u16 dib0070_wbd_offset(struct dvb_frontend *);



#endif

drivers/media/dvb/frontends/dib7000p.h

+36 −5
Original line number Diff line number Diff line
@@ -41,6 +41,14 @@ struct dib7000p_config { 
extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,

					    u8 i2c_addr,

					    struct dib7000p_config *cfg);

extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *,

						   enum dibx000_i2c_interface,

						   int);

extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,

				    int no_of_demods, u8 default_addr,

				    struct dib7000p_config cfg[]);

extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);

extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);

#else

static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,

						   u8 i2c_addr,
@@ -49,13 +57,36 @@ static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, 
	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}

#endif



extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[]);

static inline

struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe,

					    enum dibx000_i2c_interface i, int x)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return NULL;

}



extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,

				    int no_of_demods, u8 default_addr,

				    struct dib7000p_config cfg[])

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return -ENODEV;

}



extern int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return -ENODEV;

}



extern int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	return -ENODEV;

}

#endif



extern struct i2c_adapter * dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);

extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);

extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);

extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);



#endif