forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4) - a new dvb frontend for ds2103 chipset (m88ds2103) - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf) - new drivers for R-Car VSP1 - a new radio driver: radio-raremono - a new tuner driver for ts2022 chipset (m88ts2022) - the analog part of em28xx is now a separate module that only load/runs if the device is not a pure digital TV device - added a staging driver for bcm2048 radio devices - the omap 2 video driver (omap24xx) was moved to staging. This driver is for an old hardware and uses a deprecated Kernel internal API. If nobody cares enough to fix it, it would be removed on a couple Kernel releases - the sn9c102 driver was moved to staging. This driver was replaced by gspca, and disabled on some distros, as almost all devices are known to work properly with gspca. It should be removed from kernel on a couple Kernel releases - lots of driver fixes, improvements and cleanups * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits) [media] media: v4l2-dev: fix video device index assignment [media] rc-core: reuse device numbers [media] em28xx-cards: properly initialize the device bitmap [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c [media] Staging: media: Fix quoted string split across line in as102_fe.c [media] media: st-rc: Add reset support [media] m2m-deinterlace: fix allocated struct type [media] radio-usb-si4713: fix sparse non static symbol warnings [media] em28xx-audio: remove needless check before usb_free_coherent() [media] au0828: Fix sparse non static symbol warning Revert "[media] go7007-usb: only use go->dev after allocated" [media] em28xx-audio: provide an error code when URB submit fails [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0 [media] em28xx: make 'em28xx_ctrl_ops' static em28xx-alsa: Fix error patch for init/fini [media] em28xx-audio: flush work at .fini [media] drxk: remove the option to load firmware asynchronously [media] em28xx: adjust period size at runtime ...
- Loading branch information
Showing
298 changed files
with
29,135 additions
and
5,098 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -346,17 +346,14 @@ rectangle, in pixels.</entry> | |
| rectangle, in pixels. Offsets increase to the right and down.</entry> | ||
| </row> | ||
| <row> | ||
| <entry>__s32</entry> | ||
| <entry>__u32</entry> | ||
| <entry><structfield>width</structfield></entry> | ||
| <entry>Width of the rectangle, in pixels.</entry> | ||
| </row> | ||
| <row> | ||
| <entry>__s32</entry> | ||
| <entry>__u32</entry> | ||
| <entry><structfield>height</structfield></entry> | ||
| <entry>Height of the rectangle, in pixels. Width and | ||
| height cannot be negative, the fields are signed for hysterical | ||
| reasons. <!-- [email protected] on 22 Oct 2002 subject | ||
| "Re:[V4L][patches!] Re:v4l2/kernel-2.5" --></entry> | ||
| <entry>Height of the rectangle, in pixels.</entry> | ||
| </row> | ||
| </tbody> | ||
| </tgroup> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -133,18 +133,14 @@ rectangle, in pixels.</entry> | |
| rectangle, in pixels.</entry> | ||
| </row> | ||
| <row> | ||
| <entry>__s32</entry> | ||
| <entry>__u32</entry> | ||
| <entry><structfield>width</structfield></entry> | ||
| <entry>Width of the rectangle, in pixels.</entry> | ||
| </row> | ||
| <row> | ||
| <entry>__s32</entry> | ||
| <entry>__u32</entry> | ||
| <entry><structfield>height</structfield></entry> | ||
| <entry>Height of the rectangle, in pixels. Width | ||
| and height cannot be negative, the fields are signed for | ||
| hysterical reasons. <!-- [email protected] | ||
| on 22 Oct 2002 subject "Re:[V4L][patches!] Re:v4l2/kernel-2.5" --> | ||
| </entry> | ||
| <entry>Height of the rectangle, in pixels.</entry> | ||
| </row> | ||
| </tbody> | ||
| </tgroup> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| Samsung S5P/EXYNOS SoC series JPEG codec | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : should be one of: | ||
| "samsung,s5pv210-jpeg", "samsung,exynos4210-jpeg"; | ||
| - reg : address and length of the JPEG codec IP register set; | ||
| - interrupts : specifies the JPEG codec IP interrupt; | ||
| - clocks : should contain the JPEG codec IP gate clock specifier, from the | ||
| common clock bindings; | ||
| - clock-names : should contain "jpeg" entry. |
Oops, something went wrong.