Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cfcc658 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:
 - new DVB frontend drivers: ascot2e, cxd2841er, horus3a, lnbh25
 - new HDMI capture driver: tc358743
 - new driver for NetUP DVB new boards (netup_unidvb)
 - IR support for DVBSky cards (smipcie-ir)
 - Coda driver has gain macroblock tiling support
 - Renesas R-Car gains JPEG codec driver
 - new DVB platform driver for STi boards: c8sectpfe
 - added documentation for the media core kABI to device-drivers DocBook
 - lots of driver fixups, cleanups and improvements

* tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (297 commits)
  [media] c8sectpfe: Remove select on undefined LIBELF_32
  [media] i2c: fix platform_no_drv_owner.cocci warnings
  [media] cx231xx: Use wake_up_interruptible() instead of wake_up_interruptible_nr()
  [media] tc358743: only queue subdev notifications if devnode is set
  [media] tc358743: add missing Kconfig dependency/select
  [media] c8sectpfe: Use %pad to print 'dma_addr_t'
  [media] DocBook media: Fix typo "the the" in xml files
  [media] tc358743: make reset gpio optional
  [media] tc358743: set direction of reset gpio using devm_gpiod_get
  [media] dvbdev: document most of the functions/data structs
  [media] dvb_frontend.h: document the struct dvb_frontend
  [media] dvb-frontend.h: document struct dtv_frontend_properties
  [media] dvb-frontend.h: document struct dvb_frontend_ops
  [media] dvb: Use DVBFE_ALGO_HW where applicable
  [media] dvb_frontend.h: document struct analog_demod_ops
  [media] dvb_frontend.h: Document struct dvb_tuner_ops
  [media] Docbook: Document struct analog_parameters
  [media] dvb_frontend.h: get rid of dvbfe_modcod
  [media] add documentation for struct dvb_tuner_info
  [media] dvb_frontend: document dvb_frontend_tune_settings
  ...
parents e3a98ac4 50ef28a6

Documentation/DocBook/device-drivers.tmpl

+34 −0
Original line number Diff line number Diff line
@@ -217,6 +217,40 @@ X!Isound/sound_firmware.c 
-->

  </chapter>



  <chapter id="mediadev">

     <title>Media Devices</title>



     <sect1><title>Video2Linux devices</title>

!Iinclude/media/v4l2-async.h

!Iinclude/media/v4l2-ctrls.h

!Iinclude/media/v4l2-dv-timings.h

!Iinclude/media/v4l2-event.h

!Iinclude/media/v4l2-flash-led-class.h

!Iinclude/media/v4l2-mediabus.h

!Iinclude/media/v4l2-mem2mem.h

!Iinclude/media/v4l2-of.h

!Iinclude/media/v4l2-subdev.h

!Iinclude/media/videobuf2-core.h

!Iinclude/media/videobuf2-memops.h

     </sect1>

     <sect1><title>Digital TV (DVB) devices</title>

!Idrivers/media/dvb-core/dvb_ca_en50221.h

!Idrivers/media/dvb-core/dvb_frontend.h

!Idrivers/media/dvb-core/dvb_math.h

!Idrivers/media/dvb-core/dvb_ringbuffer.h

!Idrivers/media/dvb-core/dvbdev.h

     </sect1>

     <sect1><title>Remote Controller devices</title>

!Iinclude/media/rc-core.h

     </sect1>

     <sect1><title>Media Controller devices</title>

!Iinclude/media/media-device.h

!Iinclude/media/media-devnode.h

!Iinclude/media/media-entity.h

     </sect1>



  </chapter>



  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Edrivers/tty/serial/serial_core.c

Documentation/DocBook/media/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-mkdir $(MEDIA_OBJ_DIR)/media_api; \

	cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

Documentation/DocBook/media/dvb/intro.xml

+2 −3
Original line number Diff line number Diff line
@@ -163,9 +163,8 @@ are called:</para> 
<para>where N enumerates the DVB PCI cards in a system starting

from&#x00A0;0, and M enumerates the devices of each type within each

adapter, starting from&#x00A0;0, too. We will omit the &#8220;

<constant>/dev/dvb/adapterN/</constant>&#8221; in the further dicussion

of these devices. The naming scheme for the devices is the same wheter

devfs is used or not.</para>

<constant>/dev/dvb/adapterN/</constant>&#8221; in the further discussion

of these devices.</para>



<para>More details about the data structures and function calls of all

the devices are described in the following chapters.</para>

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3414,7 +3414,7 @@ giving priority to the center of the metered area.</entry> 
		<row>

		  <entry><constant>V4L2_EXPOSURE_METERING_MATRIX</constant>&nbsp;</entry>

		  <entry>A multi-zone metering. The light intensity is measured

in several points of the frame and the the results are combined. The

in several points of the frame and the results are combined. The

algorithm of the zones selection and their significance in calculating the

final value is device dependent.</entry>

		</row>

Documentation/DocBook/media/v4l/media-ioc-device-info.xml

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
	  </row>

	  <row>

	    <entry>__u32</entry>

	    <entry><structfield>media_version</structfield></entry>

	    <entry><structfield>driver_version</structfield></entry>

	    <entry>Media device driver version, formatted with the

	    <constant>KERNEL_VERSION()</constant> macro. Together with the

	    <structfield>driver</structfield> field this identifies a particular