Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c
This commit is contained in:
Jiri Kosina
@@ -32,3 +32,4 @@
|
||||
31 -> Leadtek Winfast PxDVR3200 H XC4000 [107d:6f39]
|
||||
32 -> MPX-885
|
||||
33 -> Mygica X8507 [14f1:8502]
|
||||
34 -> TerraTec Cinergy T PCIe Dual [153b:117e]
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
58 -> Pinnacle PCTV HD 800i [11bd:0051]
|
||||
59 -> DViCO FusionHDTV 5 PCI nano [18ac:d530]
|
||||
60 -> Pinnacle Hybrid PCTV [12ab:1788]
|
||||
61 -> Leadtek TV2000 XP Global [107d:6f18,107d:6618]
|
||||
61 -> Leadtek TV2000 XP Global [107d:6f18,107d:6618,107d:6619]
|
||||
62 -> PowerColor RA330 [14f1:ea3d]
|
||||
63 -> Geniatech X8000-MT DVBT [14f1:8852]
|
||||
64 -> DViCO FusionHDTV DVB-T PRO [18ac:db30]
|
||||
@@ -87,3 +87,5 @@
|
||||
86 -> TeVii S464 DVB-S/S2 [d464:9022]
|
||||
87 -> Leadtek WinFast DTV2000 H PLUS [107d:6f42]
|
||||
88 -> Leadtek WinFast DTV1800 H (XC4000) [107d:6f38]
|
||||
89 -> Leadtek TV2000 XP Global (SC4100) [107d:6f36]
|
||||
90 -> Leadtek TV2000 XP Global (XC4100) [107d:6f43]
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
6 -> Terratec Cinergy 200 USB (em2800)
|
||||
7 -> Leadtek Winfast USB II (em2800) [0413:6023]
|
||||
8 -> Kworld USB2800 (em2800)
|
||||
9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a]
|
||||
9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a,093b:a003]
|
||||
10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]
|
||||
11 -> Terratec Hybrid XS (em2880)
|
||||
12 -> Kworld PVR TV 2800 RF (em2820/em2840)
|
||||
@@ -61,7 +61,7 @@
|
||||
61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
|
||||
62 -> Gadmei TVR200 (em2820/em2840)
|
||||
63 -> Kaiomy TVnPC U2 (em2860) [eb1a:e303]
|
||||
64 -> Easy Cap Capture DC-60 (em2860)
|
||||
64 -> Easy Cap Capture DC-60 (em2860) [1b80:e309]
|
||||
65 -> IO-DATA GV-MVP/SZ (em2820/em2840) [04bb:0515]
|
||||
66 -> Empire dual TV (em2880)
|
||||
67 -> Terratec Grabby (em2860) [0ccd:0096,0ccd:10AF]
|
||||
@@ -76,7 +76,11 @@
|
||||
76 -> KWorld PlusTV 340U or UB435-Q (ATSC) (em2870) [1b80:a340]
|
||||
77 -> EM2874 Leadership ISDBT (em2874)
|
||||
78 -> PCTV nanoStick T2 290e (em28174)
|
||||
79 -> Terratec Cinergy H5 (em2884) [0ccd:10a2,0ccd:10ad]
|
||||
79 -> Terratec Cinergy H5 (em2884) [0ccd:008e,0ccd:00ac,0ccd:10a2,0ccd:10ad]
|
||||
80 -> PCTV DVB-S2 Stick (460e) (em28174)
|
||||
81 -> Hauppauge WinTV HVR 930C (em2884) [2040:1605]
|
||||
82 -> Terratec Cinergy HTC Stick (em2884) [0ccd:00b2]
|
||||
83 -> Honestech Vidbox NW03 (em2860) [eb1a:5006]
|
||||
84 -> MaxMedia UB425-TC (em2874) [1b80:e425]
|
||||
85 -> PCTV QuatroStick (510e) (em2884) [2304:0242]
|
||||
86 -> PCTV QuatroStick nano (520e) (em2884) [2013:0251]
|
||||
|
||||
@@ -187,3 +187,4 @@
|
||||
186 -> Beholder BeholdTV 501 [5ace:5010]
|
||||
187 -> Beholder BeholdTV 503 FM [5ace:5030]
|
||||
188 -> Sensoray 811/911 [6000:0811,6000:0911]
|
||||
189 -> Kworld PC150-U [17de:a134]
|
||||
|
||||
@@ -78,10 +78,11 @@ tuner=77 - TCL tuner MF02GIP-5N-E
|
||||
tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner
|
||||
tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)
|
||||
tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough
|
||||
tuner=81 - Xceive 4000 tuner
|
||||
tuner=81 - Partsnic (Daewoo) PTI-5NF05
|
||||
tuner=82 - Philips CU1216L
|
||||
tuner=83 - NXP TDA18271
|
||||
tuner=84 - Sony BTF-Pxn01Z
|
||||
tuner=85 - Philips FQ1236 MK5
|
||||
tuner=86 - Tena TNF5337 MFD
|
||||
tuner=87 - Xceive 4000 tuner
|
||||
tuner=88 - Xceive 5000C tuner
|
||||
|
||||
@@ -61,29 +61,19 @@ But that is my personal preference.
|
||||
2.2 Configuration
|
||||
|
||||
The configuration requires module configuration and device
|
||||
configuration. I like kmod or kerneld process with the
|
||||
/etc/modprobe.conf file so the modules can automatically load/unload as
|
||||
they are used. The video devices could already exist, be generated
|
||||
using MAKEDEV, or need to be created. The following sections detail
|
||||
these procedures.
|
||||
configuration. The following sections detail these procedures.
|
||||
|
||||
|
||||
2.1 Module Configuration
|
||||
|
||||
Using modules requires a bit of work to install and pass the
|
||||
parameters. Understand that entries in /etc/modprobe.conf of:
|
||||
parameters. Understand that entries in /etc/modprobe.d/*.conf of:
|
||||
|
||||
alias parport_lowlevel parport_pc
|
||||
options parport_pc io=0x378 irq=none
|
||||
alias char-major-81 videodev
|
||||
alias char-major-81-0 c-qcam
|
||||
|
||||
will cause the kmod/modprobe to do certain things. If you are
|
||||
using kmod, then a request for a 'char-major-81-0' will cause
|
||||
the 'c-qcam' module to load. If you have other video sources with
|
||||
modules, you might want to assign the different minor numbers to
|
||||
different modules.
|
||||
|
||||
2.2 Device Configuration
|
||||
|
||||
At this point, we need to ensure that the device files exist.
|
||||
|
||||
@@ -255,7 +255,7 @@ Load zr36067.o. If it can't autodetect your card, use the card=X insmod
|
||||
option with X being the card number as given in the previous section.
|
||||
To have more than one card, use card=X1[,X2[,X3,[X4[..]]]]
|
||||
|
||||
To automate this, add the following to your /etc/modprobe.conf:
|
||||
To automate this, add the following to your /etc/modprobe.d/zoran.conf:
|
||||
|
||||
options zr36067 card=X1[,X2[,X3[,X4[..]]]]
|
||||
alias char-major-81-0 zr36067
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# For modern kernels (2.6 or above), this belongs in /etc/modprobe.conf
|
||||
# For modern kernels (2.6 or above), this belongs in /etc/modprobe.d/*.conf
|
||||
# For for 2.4 kernels or earlier, this belongs in /etc/modules.conf.
|
||||
|
||||
# i2c
|
||||
|
||||
178
Documentation/video4linux/fimc.txt
Normal file
178
Documentation/video4linux/fimc.txt
Normal file
@@ -0,0 +1,178 @@
|
||||
Samsung S5P/EXYNOS4 FIMC driver
|
||||
|
||||
Copyright (C) 2012 Samsung Electronics Co., Ltd.
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
The FIMC (Fully Interactive Mobile Camera) device available in Samsung
|
||||
SoC Application Processors is an integrated camera host interface, color
|
||||
space converter, image resizer and rotator. It's also capable of capturing
|
||||
data from LCD controller (FIMD) through the SoC internal writeback data
|
||||
path. There are multiple FIMC instances in the SoCs (up to 4), having
|
||||
slightly different capabilities, like pixel alignment constraints, rotator
|
||||
availability, LCD writeback support, etc. The driver is located at
|
||||
drivers/media/video/s5p-fimc directory.
|
||||
|
||||
1. Supported SoCs
|
||||
=================
|
||||
|
||||
S5PC100 (mem-to-mem only), S5PV210, EXYNOS4210
|
||||
|
||||
2. Supported features
|
||||
=====================
|
||||
|
||||
- camera parallel interface capture (ITU-R.BT601/565);
|
||||
- camera serial interface capture (MIPI-CSI2);
|
||||
- memory-to-memory processing (color space conversion, scaling, mirror
|
||||
and rotation);
|
||||
- dynamic pipeline re-configuration at runtime (re-attachment of any FIMC
|
||||
instance to any parallel video input or any MIPI-CSI front-end);
|
||||
- runtime PM and system wide suspend/resume
|
||||
|
||||
Not currently supported:
|
||||
- LCD writeback input
|
||||
- per frame clock gating (mem-to-mem)
|
||||
|
||||
3. Files partitioning
|
||||
=====================
|
||||
|
||||
- media device driver
|
||||
drivers/media/video/s5p-fimc/fimc-mdevice.[ch]
|
||||
|
||||
- camera capture video device driver
|
||||
drivers/media/video/s5p-fimc/fimc-capture.c
|
||||
|
||||
- MIPI-CSI2 receiver subdev
|
||||
drivers/media/video/s5p-fimc/mipi-csis.[ch]
|
||||
|
||||
- video post-processor (mem-to-mem)
|
||||
drivers/media/video/s5p-fimc/fimc-core.c
|
||||
|
||||
- common files
|
||||
drivers/media/video/s5p-fimc/fimc-core.h
|
||||
drivers/media/video/s5p-fimc/fimc-reg.h
|
||||
drivers/media/video/s5p-fimc/regs-fimc.h
|
||||
|
||||
4. User space interfaces
|
||||
========================
|
||||
|
||||
4.1. Media device interface
|
||||
|
||||
The driver supports Media Controller API as defined at
|
||||
http://http://linuxtv.org/downloads/v4l-dvb-apis/media_common.html
|
||||
The media device driver name is "SAMSUNG S5P FIMC".
|
||||
|
||||
The purpose of this interface is to allow changing assignment of FIMC instances
|
||||
to the SoC peripheral camera input at runtime and optionally to control internal
|
||||
connections of the MIPI-CSIS device(s) to the FIMC entities.
|
||||
|
||||
The media device interface allows to configure the SoC for capturing image
|
||||
data from the sensor through more than one FIMC instance (e.g. for simultaneous
|
||||
viewfinder and still capture setup).
|
||||
Reconfiguration is done by enabling/disabling media links created by the driver
|
||||
during initialization. The internal device topology can be easily discovered
|
||||
through media entity and links enumeration.
|
||||
|
||||
4.2. Memory-to-memory video node
|
||||
|
||||
V4L2 memory-to-memory interface at /dev/video? device node. This is standalone
|
||||
video device, it has no media pads. However please note the mem-to-mem and
|
||||
capture video node operation on same FIMC instance is not allowed. The driver
|
||||
detects such cases but the applications should prevent them to avoid an
|
||||
undefined behaviour.
|
||||
|
||||
4.3. Capture video node
|
||||
|
||||
The driver supports V4L2 Video Capture Interface as defined at:
|
||||
http://linuxtv.org/downloads/v4l-dvb-apis/devices.html
|
||||
|
||||
At the capture and mem-to-mem video nodes only the multi-planar API is
|
||||
supported. For more details see:
|
||||
http://linuxtv.org/downloads/v4l-dvb-apis/planar-apis.html
|
||||
|
||||
4.4. Camera capture subdevs
|
||||
|
||||
Each FIMC instance exports a sub-device node (/dev/v4l-subdev?), a sub-device
|
||||
node is also created per each available and enabled at the platform level
|
||||
MIPI-CSI receiver device (currently up to two).
|
||||
|
||||
4.5. sysfs
|
||||
|
||||
In order to enable more precise camera pipeline control through the sub-device
|
||||
API the driver creates a sysfs entry associated with "s5p-fimc-md" platform
|
||||
device. The entry path is: /sys/platform/devices/s5p-fimc-md/subdev_conf_mode.
|
||||
|
||||
In typical use case there could be a following capture pipeline configuration:
|
||||
sensor subdev -> mipi-csi subdev -> fimc subdev -> video node
|
||||
|
||||
When we configure these devices through sub-device API at user space, the
|
||||
configuration flow must be from left to right, and the video node is
|
||||
configured as last one.
|
||||
When we don't use sub-device user space API the whole configuration of all
|
||||
devices belonging to the pipeline is done at the video node driver.
|
||||
The sysfs entry allows to instruct the capture node driver not to configure
|
||||
the sub-devices (format, crop), to avoid resetting the subdevs' configuration
|
||||
when the last configuration steps at the video node is performed.
|
||||
|
||||
For full sub-device control support (subdevs configured at user space before
|
||||
starting streaming):
|
||||
# echo "sub-dev" > /sys/platform/devices/s5p-fimc-md/subdev_conf_mode
|
||||
|
||||
For V4L2 video node control only (subdevs configured internally by the host
|
||||
driver):
|
||||
# echo "vid-dev" > /sys/platform/devices/s5p-fimc-md/subdev_conf_mode
|
||||
This is a default option.
|
||||
|
||||
5. Device mapping to video and subdev device nodes
|
||||
==================================================
|
||||
|
||||
There are associated two video device nodes with each device instance in
|
||||
hardware - video capture and mem-to-mem and additionally a subdev node for
|
||||
more precise FIMC capture subsystem control. In addition a separate v4l2
|
||||
sub-device node is created per each MIPI-CSIS device.
|
||||
|
||||
How to find out which /dev/video? or /dev/v4l-subdev? is assigned to which
|
||||
device?
|
||||
|
||||
You can either grep through the kernel log to find relevant information, i.e.
|
||||
# dmesg | grep -i fimc
|
||||
(note that udev, if present, might still have rearranged the video nodes),
|
||||
|
||||
or retrieve the information from /dev/media? with help of the media-ctl tool:
|
||||
# media-ctl -p
|
||||
|
||||
6. Platform support
|
||||
===================
|
||||
|
||||
The machine code (plat-s5p and arch/arm/mach-*) must select following options
|
||||
|
||||
CONFIG_S5P_DEV_FIMC0 mandatory
|
||||
CONFIG_S5P_DEV_FIMC1 \
|
||||
CONFIG_S5P_DEV_FIMC2 | optional
|
||||
CONFIG_S5P_DEV_FIMC3 |
|
||||
CONFIG_S5P_SETUP_FIMC /
|
||||
CONFIG_S5P_SETUP_MIPIPHY \
|
||||
CONFIG_S5P_DEV_CSIS0 | optional for MIPI-CSI interface
|
||||
CONFIG_S5P_DEV_CSIS1 /
|
||||
|
||||
Except that, relevant s5p_device_fimc? should be registered in the machine code
|
||||
in addition to a "s5p-fimc-md" platform device to which the media device driver
|
||||
is bound. The "s5p-fimc-md" device instance is required even if only mem-to-mem
|
||||
operation is used.
|
||||
|
||||
The description of sensor(s) attached to FIMC/MIPI-CSIS camera inputs should be
|
||||
passed as the "s5p-fimc-md" device platform_data. The platform data structure
|
||||
is defined in file include/media/s5p_fimc.h.
|
||||
|
||||
7. Build
|
||||
========
|
||||
|
||||
This driver depends on following config options:
|
||||
PLAT_S5P,
|
||||
PM_RUNTIME,
|
||||
I2C,
|
||||
REGULATOR,
|
||||
VIDEO_V4L2_SUBDEV_API,
|
||||
|
||||
If the driver is built as a loadable kernel module (CONFIG_VIDEO_SAMSUNG_S5P_FIMC=m)
|
||||
two modules are created (in addition to the core v4l2 modules): s5p-fimc.ko and
|
||||
optional s5p-csis.ko (MIPI-CSI receiver subdev).
|
||||
@@ -217,6 +217,7 @@ ov534_9 06f8:3003 Hercules Dualpix HD Weblog
|
||||
sonixj 06f8:3004 Hercules Classic Silver
|
||||
sonixj 06f8:3008 Hercules Deluxe Optical Glass
|
||||
pac7302 06f8:3009 Hercules Classic Link
|
||||
pac7302 06f8:301b Hercules Link
|
||||
nw80x 0728:d001 AVerMedia Camguard
|
||||
spca508 0733:0110 ViewQuest VQ110
|
||||
spca501 0733:0401 Intel Create and Share
|
||||
|
||||
@@ -55,7 +55,7 @@ Module use:
|
||||
-----------
|
||||
|
||||
In order to automatically load the meye module on use, you can put those lines
|
||||
in your /etc/modprobe.conf file:
|
||||
in your /etc/modprobe.d/meye.conf file:
|
||||
|
||||
alias char-major-81 videodev
|
||||
alias char-major-81-0 meye
|
||||
|
||||
Reference in New Issue
Block a user