diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-18 13:28:58 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-18 13:28:58 -0400 |
| commit | 43efd1edc63534d3a7486a0548c8aedf8b1128d1 (patch) | |
| tree | 9bb55aac0c87654a7413ec5d43a24b4d423d96dd | |
| parent | f0d17227d7af495bf14c34e306c4e340488703c7 (diff) | |
[media] get rid of Documentation/video4linux/lifeview.txt
Move the contents of this file to bttv.rst and saa7134.rst.
With that, we can finally remove Documentation/video4linux.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | Documentation/media/v4l-drivers/bttv.rst | 8 | ||||
| -rw-r--r-- | Documentation/media/v4l-drivers/saa7134.rst | 36 | ||||
| -rw-r--r-- | Documentation/video4linux/lifeview.txt | 42 |
3 files changed, 44 insertions, 42 deletions
diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/media/v4l-drivers/bttv.rst index 611e8d529f16..f78c135b40e7 100644 --- a/Documentation/media/v4l-drivers/bttv.rst +++ b/Documentation/media/v4l-drivers/bttv.rst | |||
| @@ -782,6 +782,14 @@ FlyVideo A2 (Elta 8680)= LR90 Rev.F (w/Remote, w/o FM, stereo TV by tda9821) {Ge | |||
| 782 | 782 | ||
| 783 | Lifeview 3000 (Elta 8681) as sold by Plus(April 2002), Germany = LR138 w/ saa7134 | 783 | Lifeview 3000 (Elta 8681) as sold by Plus(April 2002), Germany = LR138 w/ saa7134 |
| 784 | 784 | ||
| 785 | lifeview config coding on gpio pins 0-9 | ||
| 786 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| 787 | |||
| 788 | - LR50 rev. Q ("PARTS: 7031505116), Tuner wurde als Nr. 5 erkannt, Eingänge | ||
| 789 | SVideo, TV, Composite, Audio, Remote: | ||
| 790 | |||
| 791 | - CP9..1=100001001 (1: 0-Ohm-Widerstand gegen GND unbestückt; 0: bestückt) | ||
| 792 | |||
| 785 | 793 | ||
| 786 | Typhoon TV card series: | 794 | Typhoon TV card series: |
| 787 | ~~~~~~~~~~~~~~~~~~~~~~~ | 795 | ~~~~~~~~~~~~~~~~~~~~~~~ |
diff --git a/Documentation/media/v4l-drivers/saa7134.rst b/Documentation/media/v4l-drivers/saa7134.rst index 584caf8a3594..36b2ee9e0fdc 100644 --- a/Documentation/media/v4l-drivers/saa7134.rst +++ b/Documentation/media/v4l-drivers/saa7134.rst | |||
| @@ -70,6 +70,42 @@ Some details about 30/34/35: | |||
| 70 | - saa7133/35 - saa7135 is probably a marketing decision, since all those | 70 | - saa7133/35 - saa7135 is probably a marketing decision, since all those |
| 71 | chips identifies itself as 33 on pci. | 71 | chips identifies itself as 33 on pci. |
| 72 | 72 | ||
| 73 | LifeView GPIOs | ||
| 74 | -------------- | ||
| 75 | |||
| 76 | This section was authored by: Peter Missel <peter.missel@onlinehome.de> | ||
| 77 | |||
| 78 | - LifeView FlyTV Platinum FM (LR214WF) | ||
| 79 | |||
| 80 | - GP27 MDT2005 PB4 pin 10 | ||
| 81 | - GP26 MDT2005 PB3 pin 9 | ||
| 82 | - GP25 MDT2005 PB2 pin 8 | ||
| 83 | - GP23 MDT2005 PB1 pin 7 | ||
| 84 | - GP22 MDT2005 PB0 pin 6 | ||
| 85 | - GP21 MDT2005 PB5 pin 11 | ||
| 86 | - GP20 MDT2005 PB6 pin 12 | ||
| 87 | - GP19 MDT2005 PB7 pin 13 | ||
| 88 | - nc MDT2005 PA3 pin 2 | ||
| 89 | - Remote MDT2005 PA2 pin 1 | ||
| 90 | - GP18 MDT2005 PA1 pin 18 | ||
| 91 | - nc MDT2005 PA0 pin 17 strap low | ||
| 92 | - GP17 Strap "GP7"=High | ||
| 93 | - GP16 Strap "GP6"=High | ||
| 94 | |||
| 95 | - 0=Radio 1=TV | ||
| 96 | - Drives SA630D ENCH1 and HEF4052 A1 pinsto do FM radio through | ||
| 97 | SIF input | ||
| 98 | |||
| 99 | - GP15 nc | ||
| 100 | - GP14 nc | ||
| 101 | - GP13 nc | ||
| 102 | - GP12 Strap "GP5" = High | ||
| 103 | - GP11 Strap "GP4" = High | ||
| 104 | - GP10 Strap "GP3" = High | ||
| 105 | - GP09 Strap "GP2" = Low | ||
| 106 | - GP08 Strap "GP1" = Low | ||
| 107 | - GP07.00 nc | ||
| 108 | |||
| 73 | Credits | 109 | Credits |
| 74 | ------- | 110 | ------- |
| 75 | 111 | ||
diff --git a/Documentation/video4linux/lifeview.txt b/Documentation/video4linux/lifeview.txt deleted file mode 100644 index 05f9eb57aac9..000000000000 --- a/Documentation/video4linux/lifeview.txt +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | collecting data about the lifeview models and the config coding on | ||
| 2 | gpio pins 0-9 ... | ||
| 3 | ================================================================== | ||
| 4 | |||
| 5 | bt878: | ||
| 6 | LR50 rev. Q ("PARTS: 7031505116), Tuner wurde als Nr. 5 erkannt, Eingänge | ||
| 7 | SVideo, TV, Composite, Audio, Remote. CP9..1=100001001 (1: 0-Ohm-Widerstand | ||
| 8 | gegen GND unbestückt; 0: bestückt) | ||
| 9 | |||
| 10 | ------------------------------------------------------------------------------ | ||
| 11 | |||
| 12 | saa7134: | ||
| 13 | /* LifeView FlyTV Platinum FM (LR214WF) */ | ||
| 14 | /* "Peter Missel <peter.missel@onlinehome.de> */ | ||
| 15 | .name = "LifeView FlyTV Platinum FM", | ||
| 16 | /* GP27 MDT2005 PB4 pin 10 */ | ||
| 17 | /* GP26 MDT2005 PB3 pin 9 */ | ||
| 18 | /* GP25 MDT2005 PB2 pin 8 */ | ||
| 19 | /* GP23 MDT2005 PB1 pin 7 */ | ||
| 20 | /* GP22 MDT2005 PB0 pin 6 */ | ||
| 21 | /* GP21 MDT2005 PB5 pin 11 */ | ||
| 22 | /* GP20 MDT2005 PB6 pin 12 */ | ||
| 23 | /* GP19 MDT2005 PB7 pin 13 */ | ||
| 24 | /* nc MDT2005 PA3 pin 2 */ | ||
| 25 | /* Remote MDT2005 PA2 pin 1 */ | ||
| 26 | /* GP18 MDT2005 PA1 pin 18 */ | ||
| 27 | /* nc MDT2005 PA0 pin 17 strap low */ | ||
| 28 | |||
| 29 | /* GP17 Strap "GP7"=High */ | ||
| 30 | /* GP16 Strap "GP6"=High | ||
| 31 | 0=Radio 1=TV | ||
| 32 | Drives SA630D ENCH1 and HEF4052 A1 pins | ||
| 33 | to do FM radio through SIF input */ | ||
| 34 | /* GP15 nc */ | ||
| 35 | /* GP14 nc */ | ||
| 36 | /* GP13 nc */ | ||
| 37 | /* GP12 Strap "GP5" = High */ | ||
| 38 | /* GP11 Strap "GP4" = High */ | ||
| 39 | /* GP10 Strap "GP3" = High */ | ||
| 40 | /* GP09 Strap "GP2" = Low */ | ||
| 41 | /* GP08 Strap "GP1" = Low */ | ||
| 42 | /* GP07.00 nc */ | ||