|
1 # HG changeset patch |
|
2 # Parent 0389db07e7f73185c59a24f22288daf1e693569b |
|
3 Changes to build to compile rtl2832u kernel module |
|
4 |
|
5 diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/Kconfig |
|
6 --- a/linux/drivers/media/dvb/dvb-usb/Kconfig Wed Oct 27 09:16:44 2010 +0200 |
|
7 +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig Wed Oct 27 09:33:34 2010 +0200 |
|
8 @@ -346,3 +346,9 @@ |
|
9 select DVB_STB6100 if !DVB_FE_CUSTOMISE |
|
10 help |
|
11 Say Y here to support the AZ6027 device |
|
12 + |
|
13 +config DVB_USB_RTL2832U |
|
14 + tristate "Realtek RTL2832U DVB-T USB2.0 support" |
|
15 + depends on DVB_USB |
|
16 + help |
|
17 + Realtek RTL2832U DVB-T driver |
|
18 diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/Makefile |
|
19 --- a/linux/drivers/media/dvb/dvb-usb/Makefile Wed Oct 27 09:16:44 2010 +0200 |
|
20 +++ b/linux/drivers/media/dvb/dvb-usb/Makefile Wed Oct 27 09:33:34 2010 +0200 |
|
21 @@ -88,6 +88,9 @@ |
|
22 dvb-usb-az6027-objs = az6027.o |
|
23 obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o |
|
24 |
|
25 +dvb-usb-rtl2832u-objs = demod_rtl2832.o dvbt_demod_base.o dvbt_nim_base.o foundation.o math_mpi.o nim_rtl2832_mxl5007t.o nim_rtl2832_fc2580.o nim_rtl2832_mt2266.o rtl2832u.o rtl2832u_fe.o rtl2832u_io.o tuner_mxl5007t.o tuner_fc2580.o tuner_mt2266.o tuner_tua9001.o nim_rtl2832_tua9001.o |
|
26 +obj-$(CONFIG_DVB_USB_RTL2832U) += dvb-usb-rtl2832u.o |
|
27 + |
|
28 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |
|
29 # due to tuner-xc3028 |
|
30 EXTRA_CFLAGS += -Idrivers/media/common/tuners |
|
31 diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/rtl2832u.c |
|
32 --- a/linux/drivers/media/dvb/dvb-usb/rtl2832u.c Wed Oct 27 09:16:44 2010 +0200 |
|
33 +++ b/linux/drivers/media/dvb/dvb-usb/rtl2832u.c Wed Oct 27 09:33:34 2010 +0200 |
|
34 @@ -9,7 +9,7 @@ |
|
35 module_param_named(debug,dvb_usb_rtl2832u_debug, int, 0644); |
|
36 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2 (or-able))." DVB_USB_DEBUG_STATUS); |
|
37 |
|
38 -//DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
|
39 +DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
|
40 |
|
41 #define USB_EPA_CTL 0x0148 |
|
42 |
|
43 @@ -58,9 +58,9 @@ |
|
44 static int rtl2832u_usb_probe(struct usb_interface *intf, |
|
45 const struct usb_device_id *id) |
|
46 { |
|
47 - if ( ( 0== dvb_usb_device_init(intf,&rtl2832u_1st_properties,THIS_MODULE,NULL) )|| |
|
48 - ( 0== dvb_usb_device_init(intf,&rtl2832u_2nd_properties,THIS_MODULE,NULL) ) || |
|
49 - ( 0== dvb_usb_device_init(intf,&rtl2832u_3th_properties,THIS_MODULE,NULL) )) |
|
50 + if ( ( 0== dvb_usb_device_init(intf,&rtl2832u_1st_properties,THIS_MODULE,NULL,adapter_nr) )|| |
|
51 + ( 0== dvb_usb_device_init(intf,&rtl2832u_2nd_properties,THIS_MODULE,NULL,adapter_nr) ) || |
|
52 + ( 0== dvb_usb_device_init(intf,&rtl2832u_3th_properties,THIS_MODULE,NULL,adapter_nr) )) |
|
53 return 0; |
|
54 |
|
55 return -ENODEV; |
|
56 diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c |
|
57 --- a/linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c Wed Oct 27 09:16:44 2010 +0200 |
|
58 +++ b/linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c Wed Oct 27 09:33:34 2010 +0200 |
|
59 @@ -948,13 +948,13 @@ |
|
60 i2cseq[1] = 0x78; |
|
61 if(i2cBusWrite (pTuner, DeviceAddr, 0x40, i2cseq, 2) != TUNER_OK) goto error_status; |
|
62 |
|
63 -#elif defined(CRYSTAL_19.2_MHZ) /* Frequency 19.2 MHz */ |
|
64 +#elif defined(CRYSTAL_19_2_MHZ) /* Frequency 19.2 MHz */ |
|
65 i2cseq[0] = 0x01; |
|
66 i2cseq[1] = 0xA0; |
|
67 if(i2cBusWrite (pTuner, DeviceAddr, 0x1d, i2cseq, 2) != TUNER_OK) goto error_status; |
|
68 /* Note: Insert optimised register values for 0x40 / 0x41 for used crystal */ |
|
69 /* contact application support for further information */ |
|
70 -#elif defined(CRYSTAL_20.48_MHZ) /* Frequency 20,48 MHz */ |
|
71 +#elif defined(CRYSTAL_20_48_MHZ) /* Frequency 20,48 MHz */ |
|
72 i2cseq[0] = 0x01; |
|
73 i2cseq[1] = 0xA8; |
|
74 if(i2cBusWrite (pTuner, DeviceAddr, 0x1d, i2cseq, 2) != TUNER_OK) goto error_status; |