summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
AgeCommit message (Collapse)Author
2008-05-06Re-creates VIDEO_TUNERMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> VIDEO_TUNER is responsible for compilation of tuners.ko module. This were the previous behaviour before the creation of MEDIA_TUNER. Before this patch, tuner.ko were created even for drivers that don't need a tuner (like webcam drivers). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-30saa7134: dvb_unregister_frontend() shouldn't be called, if not registered yetMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-30saa7134: detach frontend, if tuner or Diseqc attach failsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Before this patch, an error at tuner or diseqc were discarded by the driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-30Use the same name convention for all tuners under common/tunersMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Auto generated by this script: for i in `find drivers/media/ -name Kconfig`; do cat $i |\ sed s,DVB_CORE_ATTACH,MEDIA_ATTACH,g |\ sed s,VIDEO_TUNER,MEDIA_TUNER,g |\ sed s,TUNER_SIMPLE,MEDIA_TUNER_SIMPLE,g |\ sed s,TUNER_TDA8290,MEDIA_TUNER_TDA8290,g |\ sed s,DVB_TDA827X,MEDIA_TUNER_TDA827X,g |\ sed s,DVB_TDA18271,MEDIA_TUNER_TDA18271,g |\ sed s,TUNER_TDA9887,MEDIA_TUNER_TDA9887,g |\ sed s,TUNER_TEA5761,MEDIA_TUNER_TEA5761,g |\ sed s,TUNER_TEA5767,MEDIA_TUNER_TEA5767,g |\ sed s,TUNER_MT20XX,MEDIA_TUNER_MT20XX,g |\ sed s,DVB_TUNER_MT2060,MEDIA_TUNER_MT2060,g |\ sed s,DVB_TUNER_MT2266,MEDIA_TUNER_MT2266,g |\ sed s,DVB_TUNER_MT2131,MEDIA_TUNER_MT2131,g |\ sed s,DVB_TUNER_QT1010,MEDIA_TUNER_QT1010,g |\ sed s,TUNER_XC2028,MEDIA_TUNER_XC2028,g |\ sed s,DVB_TUNER_XC5000,MEDIA_TUNER_XC5000,g >/tmp/temp_mv$$ mv /tmp/temp_mv$$ $i done for i in `find drivers/media/ -type f`; do cat $i |\ sed s,CONFIG_DVB_CORE_ATTACH,CONFIG_MEDIA_ATTACH,g |\ sed s,CONFIG_VIDEO_TUNER,CONFIG_MEDIA_TUNER,g |\ sed s,CONFIG_TUNER_SIMPLE,CONFIG_MEDIA_TUNER_SIMPLE,g |\ sed s,CONFIG_TUNER_TDA8290,CONFIG_MEDIA_TUNER_TDA8290,g |\ sed s,CONFIG_DVB_TDA827X,CONFIG_MEDIA_TUNER_TDA827X,g |\ sed s,CONFIG_DVB_TDA18271,CONFIG_MEDIA_TUNER_TDA18271,g |\ sed s,CONFIG_TUNER_TDA9887,CONFIG_MEDIA_TUNER_TDA9887,g |\ sed s,CONFIG_TUNER_TEA5761,CONFIG_MEDIA_TUNER_TEA5761,g |\ sed s,CONFIG_TUNER_TEA5767,CONFIG_MEDIA_TUNER_TEA5767,g |\ sed s,CONFIG_TUNER_MT20XX,CONFIG_MEDIA_TUNER_MT20XX,g |\ sed s,CONFIG_DVB_TUNER_MT2060,CONFIG_MEDIA_TUNER_MT2060,g |\ sed s,CONFIG_DVB_TUNER_MT2266,CONFIG_MEDIA_TUNER_MT2266,g |\ sed s,CONFIG_DVB_TUNER_MT2131,CONFIG_MEDIA_TUNER_MT2131,g |\ sed s,CONFIG_DVB_TUNER_QT1010,CONFIG_MEDIA_TUNER_QT1010,g |\ sed s,CONFIG_TUNER_XC2028,CONFIG_MEDIA_TUNER_XC2028,g |\ sed s,CONFIG_DVB_TUNER_XC5000,CONFIG_MEDIA_TUNER_XC5000,g >/tmp/temp_mv$$ mv /tmp/temp_mv$$ $i done Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26backport changeset f000fd80937c0d94c67f9f3e7026f1fbc8ef8873Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Author: Jeff Garzik <jgarzik@redhat.com> [ALSA] Fix synchronize_irq() bugs, redundancies free_irq() calls synchronize_irq() for you, so there is no need for drivers to manually do the same thing (again). Thus, calls where sync-irq immediately precedes free-irq can be simplified. However, during this audit several bugs were noticed, where free-irq is preceded by a "irq >= 0" check... but the sync-irq call is not covered by the same check. So, where sync-irq could not be eliminated completely, the missing check was added. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26From: Mauro Carvalho Chehab <mchehab@infradead.org>Mauro Carvalho Chehab
Move tuners to common/tuners There were several issues in the past, caused by the hybrid tuner design, since now, the same tuner can be used by drivers/media/dvb and drivers/media/video. This patch moves those common tuners into a common dir. It also moves saa7146 driver into drivers/media/video, where other hybrid drivers are placed. Kconfig items were rearranged, to split V4L/DVB core from their drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26saa7134: add another PCI ID for Beholder M6Mauro Carvalho Chehab
From: Igor Kuznetsov <igk@igk.ru> Signed-off-by: Igor Kuznetsov <igk@igk.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26Add support for Beholder BeholdTV H6Mauro Carvalho Chehab
From: Igor Kuznetsov <igk@igk.ru> Signed-off-by: Igor Kuznetsov <igk@igk.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-26saa7134: fix tuner setupMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Tuner setup were happening during i2c attach callback. This means that it would happen on two conditions: 1) if tuner module weren't load, it will happen at request_module("tuner"); 2) if tuner is not compiled as a module, or it is already loaded (for example, on setups with more than one tuner), it will happen when saa7134 registers I2C bus. Due to that, if tuner were loaded, tuner setup will happen _before_ reading the proper values at tuner eeprom. Since set_addr refuses to change for a tuner that were previously defined (except if the tuner_addr is set), this were making eeprom tuner detection useless. This patch removes tuner type setup from saa7134-i2c, moving it to the proper place, after taking eeprom into account. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-23saa7134: Add/fix Beholder entriesMauro Carvalho Chehab
From: Dmitry Belimov <d.belimov@gmail.com> Beholder TV/FM tuners: Changes: Add support Beholder Columbus PCMCIA card. Add key map for remote control of Beholder Columbus PCMCIA card. Fix gpiomask for all Beholder tuners. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-23saa7134: fix: Properly handle busy states on i2c busMauro Carvalho Chehab
From: Dmitry Belimov <d.belimov@gmail.com> There are two conditions, reported by saa7134 that indicates that the I2C bus is busy: TO_SCL and TO_ARB. On both states, it needs to wait for I2C release, before using the bus. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-10tda10086: make the xtal frequency a configuration optionHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Some DVB-S boards, i.e. with the SD1878 tuner, use a 4 MHz reference frequency. This reqires a different setup of the clock PLL. This patch adds an enum to the tda10086_config struct and sets the proper values for the boards. This patch also fixes the DVB-S section of the MD7134_BRIDGE_2 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-04-13merge: http://linuxtv.org/hg/~mkrufky/dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-11cx88/saa7134: Fix: avoid OOPS on module unloadMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> If frontend is not attached, both cx88-dvb and saa7134-dvb don't register DVB. However, dvb unregister were inconditionally called. Due to that, an OOPS is generated. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-09Adds selectable adapter numbers as per module optionMichael Krufky
From: Janne Grunau <janne-dvb@grunau.be> The adapter_nr module options can be used to allocate static adapter numbers on a driver level. It avoids problems with changing DVB apapter numbers after warm/cold boot or device unplugging and repluging. Each driver holds DVB_MAX_ADAPTER long array of the preferred order of adapter numbers. options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a reversed allocation of adapter numbers. With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If both are already in use it will allocate the lowest free adapter number. Signed-off-by: Janne Grunau <janne-dvb@grunau.be> Acked-by: Hermann Pitton <hermann.pitton@arcor.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-04-08media/video/saa7134 replace remaining __FUNCTION__ occurrencesMichael Krufky
From: Harvey Harrison <harvey.harrison@gmail.com> __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-04-08saa7134: add analog support for Avermedia A700 cardsMauro Carvalho Chehab
Add support for composite and s-video inputs on Avermedia DVB-S Pro and DVB-S Hybrid+FM cards (both labled A700) to the saa7134 driver. XC2028 support for Hybrid+FM is still missing. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-28saa7134: Adds analog support for Avermedia A16DMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Thanks to timf <timf@iinet.net.au>, "Richard (MQ)" <osl2008@googlemail.com> and gian luca rasponi <lucarasp@inwind.it> for their tests. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-26kconfig fixes for tuner-simpleMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Update Kconfig for the hybrid devices recently converted to use tuner-simple rather than dvb-pll. dvb-bt8xx no longer uses dvb-pll at all, so remove all references to dvb-pll within that driver. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-25merge: http://linuxtv.org/hg/~mkrufky/tunerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-23saa7134.h: Remove unnecessary validationDouglas Schilling Landgraf
From: Douglas Schilling Landgraf <dougsland@gmail.com> Removed unnecessary VIDIOC_G_PRIORITY validation. Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
2008-03-21Removes video_dev from tuner-xc2028 config structMauro Carvalho Chehab
The video_dev parameter, on tuner-xc2028 were used to pass i2c private data to tuner_callback. Since the driver already have a pointer to i2c_adap->algo_data, uses this instead. This parameter were used also as a magic number to idenfity if two drivers are trying to register the same xc3028 tuner. This occurs with boards with DVB support, where both DVB and V4L drivers will share the same tuner. Instead of using the algo_data as a private number, after this patch, the driver will use i2c_adap->dev, with seems more consistent. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-21Adds an error if priv argument of tuner_callback is NULLMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Adds a consistency check to avoid OOPS, if tuner_callback priv argument is NULL. Also, simplifies callback codes on cx88. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-21merge: http://linuxtv.org/hg/~hhackmann/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-20saa7134: fixed pointer in tuner callbackHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The pointer transferred directly points to the saa7134_dev structure Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-20saa7134: start 2nd LND supply of Medion cards only if neededHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The ISL6405 LNB supply is used on several Creatix / Medion cards. But only the MD8800 needs its second section. So don't start it unless it is needed. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-20saa7134: add number of devices checkHartmut Hackmann
From: Alan McIvor <alan.mcivor@reveal.co.nz> This patch fixes reported problems when trying to add a 9th device into a system. Signed-off-by: Alan McIvor <alan.mcivor@reveal.co.nz> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-18saa7134: fix radio entry for xc2028/3028 boardsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> If left in blank, the driver will use value 0 (Temic PAL) Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-18saa7134: Fix xc3028 entriesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Tuner addresses were incorrect. Fix the entries. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-18merge: http://linuxtv.org/hg/~mkrufky/tunerMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-16tda827x: fixed support of tuners with LNAHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Tuner refactoring broke support of tuners with LNA configurations 1 and 2 for both, analog TV and DVB-T. Additionally, this patch initializes the saa713x gpios defined by the gpiomask at driver init to avoid undefined stated at dvb. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-15tuner: rename TUNER_PHILIPS_ATSC to TUNER_PHILIPS_FCV1236DMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> TUNER_PHILIPS_ATSC is an ambiguous name for a tuner. Rename it to TUNER_PHILIPS_FCV1236D to be more descriptive. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-03-17cx88/saa7134: fix magic number for xc3028 reusage detectionMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> tuner-xc2028 needs to know when a DVB module is sharing the same analog tuner. This is done by comparing a magic number that needs to be the same on analog and on digital. To make easier, this magic number is a pointer to some data struct. With the previous code, two different pointers were using, causing a miss-detection. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-03-03saa7134: support 2nd DVB-S section of the MD8800Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> There are some restrictions: - The 2nd DVB-S section will only work if the 1st is configured for DVB-S too. so "options saa7134-dvb use_frontend=0,1" won't work. - Currently it is not possible to set the higher LNB supply voltages, so 14V instead of 13V in the 2nd section. - It is not possibe to turn off the 2nd LNB supply independently. This comes from the problem that the 2nd section can't access the i2c interface of the LNB supply chip. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-02saa7134: Add DVB-S support for the MD 1734 cards with 2 saa7134Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-03-02saa7134: clear audio DSP interface after access errorHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> In the case of an access error to the high latency registers of the audio DSP, the interface needs to be cleared, otherwise a cascade of errors occurs. This patch is closely modeled after a proposal by Mirek Slugen Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-02-17use tuner-simple for Philips TUV1236D digital tuning supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Convert cx88-dvb and saa7134-dvb to use tuner-simple instead of dvb-pll for Philips TUV1236D Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-02-17use tuner-simple for Philips TD1316 digital tuning supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Convert saa7134-dvb to use tuner-simple instead of dvb-pll for Philips TD1316 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-02-10use tuner-simple for Philips FMD1216ME digital tuning supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Convert cxusb, cx88-dvb and saa7134-dvb to use tuner-simple instead of dvb-pll for Philips FMD1216ME Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-02-19saa7134: fix: tuner should be loaded before calling saa7134_board_init2()Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> There are several parts of saa7134_board_init2() that calls tuner modules. We should first load tuner, otherwise, the commands will fail. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-05Add support for xc3028-based boardsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch adds support for the following saa7134 xc3028 based boards: 132 -> AVerMedia Cardbus TV/Radio (E506R) [1461:f436] 133 -> AVerMedia Hybrid TV/Radio (A16D) [1461:f936] 134 -> Avermedia M115 [1461:a836] 135 -> Compro VideoMate T750 [185b:c900] This is based on a original patch thanks to Markus Rechberger that added xc3028 gpio init code for the above boards. This patch moves saa7134_tuner_callback to saa7134-cards, originally used only by tda8290 DVB-S boards. The callback was made more generic to support other tuners. Currently, it supports both tda8290 and xc2028/xc3028 tuners. Added also the basis for xc5000 tuner callback. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/Documentation/video4linux/CARDLIST.saa7134 | 4 linux/drivers/media/video/saa7134/saa7134-cards.c | 255 ++++++++++++++++++++-- linux/drivers/media/video/saa7134/saa7134-core.c | 34 -- linux/drivers/media/video/saa7134/saa7134-dvb.c | 39 +++ linux/drivers/media/video/saa7134/saa7134.h | 7 5 files changed, 290 insertions(+), 49 deletions(-)
2008-02-05Use the same callback argument as xc3028 and xc5000Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-25From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>Mauro Carvalho Chehab
Subject: Convert videobuf-dma-sg to generic DMA API Date: Tue, 19 Feb 2008 13:40:54 +0100 (CET) videobuf-dma-sg does not need to depend on PCI. Switch it to using generic DMA API, convert all affected drivers, relax Kconfig restriction, improve compile-time type checking, fix some Coding Style violations while at it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-17saa7134: add support for the MSI TV@nywhere A/D v1.1 cardHartmut Hackmann
From: Russell Kliese <russell@kliese.wattle.id.au> Signed-off-by: Russell Kliese <russell@kliese.wattle.id.au> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-02-17saa7134: add support for the Creatix CTX953_V.1.4.3 HybridHartmut Hackmann
From: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-02-17saa7134: fix FM radio support for the Pinnacle PCTV 110iHartmut Hackmann
From: Yuri Funduryan <yurifun@mail.ru> This also has some coding style fixes. Signed-off-by: Yuri Funduryan <yurifun@mail.ru> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>
2008-02-14saa7134: fixed DVB-S support for Medion/Creatix CTX948Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> The I2C bus interface of the LNB supply sits behind the i2c gate of the tda10086, so wrappers were necessary for the set_voltage functions. For the time being, the board will show up as MD8800 Many thanks to Hermann Pitton for his help Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-02-16saa7134: add support for the NXP Snake DVB-S reference designHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-01-20Initial DVB-S support for MD8800 /CTX948Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> Support is not complete yet and untested. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2008-02-11Adds support for Genius TVGo A11MCEMauro Carvalho Chehab
From: Adrian Pardini <pardo.bsso@gmail.com> Signed-off-by: Adrian Pardini <pardo.bsso@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>