Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit c482d4f6e87932092c0a30da8e6403b23544f894

Authored by Andrew de Quincey
Committed by Mauro Carvalho Chehab
1 parent 8a905162e0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (4608b): i2c deps fix on DVB 

Several DVB modules depends on I2C

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 10 changed files with 46 additions and 30 deletions Side-by-side Diff

drivers/media/dvb/b2c2/Kconfig
Diff comments   View file @ c482d4f
1 1 config DVB_B2C2_FLEXCOP
2 2 tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
3 3 depends on DVB_CORE && I2C
  4 + select DVB_PLL
4 5 select DVB_STV0299
5 6 select DVB_MT352
6 7 select DVB_MT312
drivers/media/dvb/bt8xx/Kconfig
Diff comments   View file @ c482d4f
1 1 config DVB_BT8XX
2 2 tristate "BT8xx based PCI cards"
3 3 depends on DVB_CORE && PCI && I2C && VIDEO_BT848
  4 + select DVB_PLL
4 5 select DVB_MT352
5 6 select DVB_SP887X
6 7 select DVB_NXT6000
drivers/media/dvb/dvb-usb/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -2,6 +2,7 @@
2 2 tristate "Support for various USB DVB devices"
3 3 depends on DVB_CORE && USB && I2C
4 4 select FW_LOADER
  5 + select DVB_PLL
5 6 help
6 7 By enabling this you will be able to choose the various supported
7 8 USB1.1 and USB2.0 DVB devices.
drivers/media/dvb/frontends/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -6,43 +6,43 @@
6 6  
7 7 config DVB_STV0299
8 8 tristate "ST STV0299 based"
9   - depends on DVB_CORE
  9 + depends on DVB_CORE && I2C
10 10 help
11 11 A DVB-S tuner module. Say Y when you want to support this frontend.
12 12  
13 13 config DVB_CX24110
14 14 tristate "Conexant CX24110 based"
15   - depends on DVB_CORE
  15 + depends on DVB_CORE && I2C
16 16 help
17 17 A DVB-S tuner module. Say Y when you want to support this frontend.
18 18  
19 19 config DVB_CX24123
20 20 tristate "Conexant CX24123 based"
21   - depends on DVB_CORE
  21 + depends on DVB_CORE && I2C
22 22 help
23 23 A DVB-S tuner module. Say Y when you want to support this frontend.
24 24  
25 25 config DVB_TDA8083
26 26 tristate "Philips TDA8083 based"
27   - depends on DVB_CORE
  27 + depends on DVB_CORE && I2C
28 28 help
29 29 A DVB-S tuner module. Say Y when you want to support this frontend.
30 30  
31 31 config DVB_MT312
32 32 tristate "Zarlink VP310/MT312 based"
33   - depends on DVB_CORE
  33 + depends on DVB_CORE && I2C
34 34 help
35 35 A DVB-S tuner module. Say Y when you want to support this frontend.
36 36  
37 37 config DVB_VES1X93
38 38 tristate "VLSI VES1893 or VES1993 based"
39   - depends on DVB_CORE
  39 + depends on DVB_CORE && I2C
40 40 help
41 41 A DVB-S tuner module. Say Y when you want to support this frontend.
42 42  
43 43 config DVB_S5H1420
44 44 tristate "Samsung S5H1420 based"
45   - depends on DVB_CORE
  45 + depends on DVB_CORE && I2C
46 46 help
47 47 A DVB-S tuner module. Say Y when you want to support this frontend.
48 48  
... ... @@ -51,7 +51,7 @@
51 51  
52 52 config DVB_SP8870
53 53 tristate "Spase sp8870 based"
54   - depends on DVB_CORE
  54 + depends on DVB_CORE && I2C
55 55 select FW_LOADER
56 56 help
57 57 A DVB-T tuner module. Say Y when you want to support this frontend.
... ... @@ -63,7 +63,7 @@
63 63  
64 64 config DVB_SP887X
65 65 tristate "Spase sp887x based"
66   - depends on DVB_CORE
  66 + depends on DVB_CORE && I2C
67 67 select FW_LOADER
68 68 help
69 69 A DVB-T tuner module. Say Y when you want to support this frontend.
70 70  
71 71  
72 72  
... ... @@ -75,25 +75,25 @@
75 75  
76 76 config DVB_CX22700
77 77 tristate "Conexant CX22700 based"
78   - depends on DVB_CORE
  78 + depends on DVB_CORE && I2C
79 79 help
80 80 A DVB-T tuner module. Say Y when you want to support this frontend.
81 81  
82 82 config DVB_CX22702
83 83 tristate "Conexant cx22702 demodulator (OFDM)"
84   - depends on DVB_CORE
  84 + depends on DVB_CORE && I2C
85 85 help
86 86 A DVB-T tuner module. Say Y when you want to support this frontend.
87 87  
88 88 config DVB_L64781
89 89 tristate "LSI L64781"
90   - depends on DVB_CORE
  90 + depends on DVB_CORE && I2C
91 91 help
92 92 A DVB-T tuner module. Say Y when you want to support this frontend.
93 93  
94 94 config DVB_TDA1004X
95 95 tristate "Philips TDA10045H/TDA10046H based"
96   - depends on DVB_CORE
  96 + depends on DVB_CORE && I2C
97 97 select FW_LOADER
98 98 help
99 99 A DVB-T tuner module. Say Y when you want to support this frontend.
100 100  
101 101  
102 102  
103 103  
... ... @@ -106,32 +106,32 @@
106 106  
107 107 config DVB_NXT6000
108 108 tristate "NxtWave Communications NXT6000 based"
109   - depends on DVB_CORE
  109 + depends on DVB_CORE && I2C
110 110 help
111 111 A DVB-T tuner module. Say Y when you want to support this frontend.
112 112  
113 113 config DVB_MT352
114 114 tristate "Zarlink MT352 based"
115   - depends on DVB_CORE
  115 + depends on DVB_CORE && I2C
116 116 help
117 117 A DVB-T tuner module. Say Y when you want to support this frontend.
118 118  
119 119 config DVB_ZL10353
120 120 tristate "Zarlink ZL10353 based"
121   - depends on DVB_CORE
  121 + depends on DVB_CORE && I2C
122 122 help
123 123 A DVB-T tuner module. Say Y when you want to support this frontend.
124 124  
125 125 config DVB_DIB3000MB
126 126 tristate "DiBcom 3000M-B"
127   - depends on DVB_CORE
  127 + depends on DVB_CORE && I2C
128 128 help
129 129 A DVB-T tuner module. Designed for mobile usage. Say Y when you want
130 130 to support this frontend.
131 131  
132 132 config DVB_DIB3000MC
133 133 tristate "DiBcom 3000P/M-C"
134   - depends on DVB_CORE
  134 + depends on DVB_CORE && I2C
135 135 help
136 136 A DVB-T tuner module. Designed for mobile usage. Say Y when you want
137 137 to support this frontend.
138 138  
139 139  
... ... @@ -141,19 +141,19 @@
141 141  
142 142 config DVB_VES1820
143 143 tristate "VLSI VES1820 based"
144   - depends on DVB_CORE
  144 + depends on DVB_CORE && I2C
145 145 help
146 146 A DVB-C tuner module. Say Y when you want to support this frontend.
147 147  
148 148 config DVB_TDA10021
149 149 tristate "Philips TDA10021 based"
150   - depends on DVB_CORE
  150 + depends on DVB_CORE && I2C
151 151 help
152 152 A DVB-C tuner module. Say Y when you want to support this frontend.
153 153  
154 154 config DVB_STV0297
155 155 tristate "ST STV0297 based"
156   - depends on DVB_CORE
  156 + depends on DVB_CORE && I2C
157 157 help
158 158 A DVB-C tuner module. Say Y when you want to support this frontend.
159 159  
... ... @@ -162,7 +162,7 @@
162 162  
163 163 config DVB_NXT200X
164 164 tristate "NxtWave Communications NXT2002/NXT2004 based"
165   - depends on DVB_CORE
  165 + depends on DVB_CORE && I2C
166 166 select FW_LOADER
167 167 help
168 168 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
... ... @@ -176,7 +176,7 @@
176 176  
177 177 config DVB_OR51211
178 178 tristate "Oren OR51211 based"
179   - depends on DVB_CORE
  179 + depends on DVB_CORE && I2C
180 180 select FW_LOADER
181 181 help
182 182 An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
... ... @@ -188,7 +188,7 @@
188 188  
189 189 config DVB_OR51132
190 190 tristate "Oren OR51132 based"
191   - depends on DVB_CORE
  191 + depends on DVB_CORE && I2C
192 192 select FW_LOADER
193 193 help
194 194 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
... ... @@ -203,7 +203,7 @@
203 203  
204 204 config DVB_BCM3510
205 205 tristate "Broadcom BCM3510"
206   - depends on DVB_CORE
  206 + depends on DVB_CORE && I2C
207 207 select FW_LOADER
208 208 help
209 209 An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
... ... @@ -211,7 +211,7 @@
211 211  
212 212 config DVB_LGDT330X
213 213 tristate "LG Electronics LGDT3302/LGDT3303 based"
214   - depends on DVB_CORE
  214 + depends on DVB_CORE && I2C
215 215 help
216 216 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
217 217 to support this frontend.
218 218  
219 219  
... ... @@ -220,15 +220,19 @@
220 220 comment "Miscellaneous devices"
221 221 depends on DVB_CORE
222 222  
  223 +config DVB_PLL
  224 + tristate
  225 + depends on DVB_CORE && I2C
  226 +
223 227 config DVB_LNBP21
224 228 tristate "LNBP21 SEC controller"
225   - depends on DVB_CORE
  229 + depends on DVB_CORE && I2C
226 230 help
227 231 An SEC control chip.
228 232  
229 233 config DVB_ISL6421
230 234 tristate "ISL6421 SEC controller"
231   - depends on DVB_CORE
  235 + depends on DVB_CORE && I2C
232 236 help
233 237 An SEC control chip.
234 238  
drivers/media/dvb/frontends/Makefile
Diff comments   View file @ c482d4f
... ... @@ -4,7 +4,7 @@
4 4  
5 5 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
6 6  
7   -obj-$(CONFIG_DVB_CORE) += dvb-pll.o
  7 +obj-$(CONFIG_DVB_PLL) += dvb-pll.o
8 8 obj-$(CONFIG_DVB_STV0299) += stv0299.o
9 9 obj-$(CONFIG_DVB_SP8870) += sp8870.o
10 10 obj-$(CONFIG_DVB_CX22700) += cx22700.o
drivers/media/dvb/pluto2/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -2,6 +2,7 @@
2 2 tristate "Pluto2 cards"
3 3 depends on DVB_CORE && PCI && I2C
4 4 select I2C_ALGOBIT
  5 + select DVB_PLL
5 6 select DVB_TDA1004X
6 7 help
7 8 Support for PCI cards based on the Pluto2 FPGA like the Satelco
drivers/media/dvb/ttpci/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -3,6 +3,7 @@
3 3 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
4 4 select FW_LOADER
5 5 select VIDEO_SAA7146_VV
  6 + select DVB_PLL
6 7 select DVB_VES1820
7 8 select DVB_VES1X93
8 9 select DVB_STV0299
... ... @@ -61,6 +62,7 @@
61 62 tristate "Budget cards"
62 63 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
63 64 select VIDEO_SAA7146
  65 + select DVB_PLL
64 66 select DVB_STV0299
65 67 select DVB_VES1X93
66 68 select DVB_VES1820
... ... @@ -83,6 +85,7 @@
83 85 tristate "Budget cards with onboard CI connector"
84 86 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
85 87 select VIDEO_SAA7146
  88 + select DVB_PLL
86 89 select DVB_STV0297
87 90 select DVB_STV0299
88 91 select DVB_TDA1004X
... ... @@ -104,6 +107,7 @@
104 107 tristate "Budget cards with analog video inputs"
105 108 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
106 109 select VIDEO_SAA7146_VV
  110 + select DVB_PLL
107 111 select DVB_STV0299
108 112 select DVB_TDA1004X
109 113 select DVB_TDA10021
... ... @@ -122,6 +126,7 @@
122 126 tristate "AV7110 cards with Budget Patch"
123 127 depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
124 128 select DVB_AV7110
  129 + select DVB_PLL
125 130 select DVB_STV0299
126 131 select DVB_VES1X93
127 132 select DVB_TDA8083
drivers/media/dvb/ttusb-budget/Kconfig
Diff comments   View file @ c482d4f
1 1 config DVB_TTUSB_BUDGET
2 2 tristate "Technotrend/Hauppauge Nova-USB devices"
3   - depends on DVB_CORE && USB
  3 + depends on DVB_CORE && USB && I2C
  4 + select DVB_PLL
4 5 select DVB_CX22700
5 6 select DVB_TDA1004X
6 7 select DVB_VES1820
drivers/media/video/cx88/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -51,6 +51,7 @@
51 51 tristate "DVB/ATSC Support for cx2388x based TV cards"
52 52 depends on VIDEO_CX88 && DVB_CORE
53 53 select VIDEO_BUF_DVB
  54 + select DVB_PLL
54 55 ---help---
55 56 This adds support for DVB/ATSC cards based on the
56 57 Conexant 2388x chip.
drivers/media/video/saa7134/Kconfig
Diff comments   View file @ c482d4f
... ... @@ -40,6 +40,7 @@
40 40 depends on VIDEO_SAA7134 && DVB_CORE
41 41 select VIDEO_BUF_DVB
42 42 select FW_LOADER
  43 + select DVB_PLL
43 44 ---help---
44 45 This adds support for DVB cards based on the
45 46 Philips saa7134 chip.