linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 00/22] Move media documentation files
@ 2020-03-10 13:42 Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 15/22] media: docs: split uAPI info from imx.rst Mauro Carvalho Chehab
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2020-03-10 13:42 UTC (permalink / raw)
  To: Linux Doc Mailing List
  Cc: linux-fbdev, Sakari Ailus, Todor Tomov, Hans Verkuil, Harry Wei,
	Alex Shi, Fabio Estevam, devel, Jonathan Corbet,
	Mauro Carvalho Chehab, Antti Palosaari, Michael Krufky,
	NXP Linux Team, Federico Vaga, Steve Longerbeam, Bingbu Cao,
	Tian Shu Qiu, Yong Zhi, Pengutronix Kernel Team,
	Bartlomiej Zolnierkiewicz, Malcolm Priestley, Sascha Hauer,
	Ramesh Shanmugasundaram, Rui Miguel Silva, dri-devel, Mike Isely,
	linux-arm-kernel, Antoine Jacquet, Andy Walls, Greg Kroah-Hartman,
	linux-usb, linux-kernel, Philipp Zabel, Hans Verkuil, linux-media,
	Shawn Guo

That's a second version of a patch series with moves the media documents
to better places.

The first version was actually a RFC. This one is more complete. Yet,
my plan is to merge it only at the media trees only after the end of the
next merge window.

I'm preparing several patches on the top of this series, with are updating
old documents that were at the driver-specific part of the documentation.

Mauro Carvalho Chehab (22):
  media: docs: avermedia.rst: mark a table as such
  media: docs: move soc-camera.rst to staging
  media: docs: split cpia2.rst on two files
  media: docs: split ci.rst into uAPI and user guide docs
  media: docs: split meye.rst into admin and uAPI docs
  media: docs: split vimc.rst into devel and admin parts
  media: docs: split development info from bttv.rst
  media: docs: split development info from cx88.rst
  media: docs: split cx2341x.rst into different audiences
  media: docs: cx18-streams.c: fix broken references to docs
  media: docs: split uAPI info from davinci-vpbe.rst
  media: docs: split uAPI info from fimc.rst
  media: docs: split uAPI info from saa7134-devel.rst
  media: docs: split uAPI info from omap3isp.rst
  media: docs: split uAPI info from imx.rst
  media: docs: move uAPI book to userspace-api/media
  media: docs: kAPI docs: move them to driver-api
  media: docs: move fourcc file to the uAPI document
  media: docs: move user-facing docs to the admin guide
  media: docs: move driver-specific info to driver-api
  media: docs: add an uAPI chapter for driver-specific stuff
  media: docs: get rid of Documentation/media/

 .../ABI/testing/debugfs-cec-error-inj         |   2 +-
 Documentation/Makefile                        |  10 +-
 Documentation/admin-guide/index.rst           |   1 +
 .../admin-guide/kernel-parameters.txt         |   4 +-
 .../media}/au0828-cardlist.rst                |   0
 .../media}/avermedia.rst                      |   4 +
 .../media}/bt8xx.rst                          |   8 +-
 .../media}/bttv-cardlist.rst                  |   0
 .../media}/bttv.rst                           | 120 ------------
 .../media}/cafe_ccic.rst                      |   0
 .../media}/cardlist.rst                       |   0
 .../media}/cards.rst                          |   0
 Documentation/admin-guide/media/ci.rst        |  77 ++++++++
 .../media}/cpia2.rst                          |  46 -----
 .../media}/cx23885-cardlist.rst               |   0
 .../media}/cx88-cardlist.rst                  |   0
 Documentation/admin-guide/media/cx88.rst      |  58 ++++++
 .../media}/davinci-vpbe.rst                   |  42 +---
 .../media}/em28xx-cardlist.rst                |   0
 .../dvb-drivers => admin-guide/media}/faq.rst |   0
 .../media}/fimc.rst                           |  22 +--
 .../media}/gspca-cardlist.rst                 |   0
 .../v4l-drivers => admin-guide/media}/imx.rst |  88 +--------
 .../media}/imx7.rst                           |   0
 Documentation/admin-guide/media/index.rst     | 104 ++++++++++
 .../media}/intro.rst                          |   0
 .../media}/ipu3.rst                           |   0
 .../media}/ipu3_rcb.svg                       |   0
 .../media}/ivtv-cardlist.rst                  |   0
 .../media}/ivtv.rst                           |   0
 .../media}/lmedm04.rst                        |   0
 .../media}/meye.rst                           |  41 ----
 Documentation/admin-guide/media/omap3isp.rst  |  92 +++++++++
 .../media}/omap4_camera.rst                   |   0
 .../media}/opera-firmware.rst                 |   0
 .../media}/philips.rst                        |   0
 .../media}/pulse8-cec.rst                     |   0
 .../media}/qcom_camss.rst                     |   0
 .../media}/qcom_camss_8x96_graph.dot          |   0
 .../media}/qcom_camss_graph.dot               |   0
 .../media}/rcar-fdp1.rst                      |   0
 .../media}/saa7134-cardlist.rst               |   0
 Documentation/admin-guide/media/saa7134.rst   |  61 ++++++
 .../media}/saa7164-cardlist.rst               |   0
 .../media}/si470x.rst                         |   0
 .../media}/si4713.rst                         |   0
 .../media}/si476x.rst                         |   0
 .../media}/technisat.rst                      |   0
 .../media}/tm6000-cardlist.rst                |   0
 .../media}/ttusb-dec.rst                      |   0
 .../media}/tuner-cardlist.rst                 |   0
 .../media}/udev.rst                           |   0
 .../media}/usbvision-cardlist.rst             |   0
 .../media}/v4l-with-ir.rst                    |   0
 .../media}/vimc.dot                           |   0
 .../media}/vimc.rst                           |  11 --
 .../media}/vivid.rst                          |   0
 .../media}/zr364xx.rst                        |   0
 Documentation/doc-guide/parse-headers.rst     |   2 +-
 Documentation/driver-api/index.rst            |   1 +
 .../kapi => driver-api/media}/cec-core.rst    |   0
 .../{media/kapi => driver-api/media}/csi2.rst |   0
 .../driver-api/media/drivers/bttv-devel.rst   | 123 ++++++++++++
 .../media/drivers}/contributors.rst           |   0
 .../driver-api/media/drivers/cpia2_devel.rst  |  56 ++++++
 .../media/drivers/cx2341x-devel.rst}          | 175 -----------------
 .../media/drivers/cx88-devel.rst}             |  52 -----
 .../media/drivers/davinci-vpbe-devel.rst      |  39 ++++
 .../media/drivers}/dvb-usb.rst                |   0
 .../driver-api/media/drivers/fimc-devel.rst   |  33 ++++
 .../media/drivers}/frontends.rst              |   0
 .../media/drivers}/index.rst                  |  40 ++--
 .../media/drivers}/pvrusb2.rst                |   0
 .../media/drivers}/pxa_camera.rst             |   0
 .../media/drivers}/radiotrack.rst             |   0
 .../media/drivers/saa7134-devel.rst}          |  48 -----
 .../media/drivers}/sh_mobile_ceu_camera.rst   |   0
 .../media/drivers}/tuners.rst                 |   0
 .../driver-api/media/drivers/vimc-devel.rst   |  15 ++
 .../kapi => driver-api/media}/dtv-ca.rst      |   0
 .../kapi => driver-api/media}/dtv-common.rst  |   0
 .../kapi => driver-api/media}/dtv-core.rst    |   0
 .../kapi => driver-api/media}/dtv-demux.rst   |   0
 .../media}/dtv-frontend.rst                   |   0
 .../kapi => driver-api/media}/dtv-net.rst     |   0
 .../media/index.rst}                          |  14 +-
 .../kapi => driver-api/media}/mc-core.rst     |   0
 .../kapi => driver-api/media}/rc-core.rst     |   0
 .../kapi => driver-api/media}/v4l2-async.rst  |   0
 .../kapi => driver-api/media}/v4l2-clocks.rst |   0
 .../kapi => driver-api/media}/v4l2-common.rst |   0
 .../media}/v4l2-controls.rst                  |   0
 .../kapi => driver-api/media}/v4l2-core.rst   |   0
 .../kapi => driver-api/media}/v4l2-dev.rst    |   0
 .../kapi => driver-api/media}/v4l2-device.rst |   0
 .../media}/v4l2-dv-timings.rst                |   0
 .../kapi => driver-api/media}/v4l2-event.rst  |   0
 .../kapi => driver-api/media}/v4l2-fh.rst     |   0
 .../media}/v4l2-flash-led-class.rst           |   0
 .../kapi => driver-api/media}/v4l2-fwnode.rst |   0
 .../kapi => driver-api/media}/v4l2-intro.rst  |   0
 .../kapi => driver-api/media}/v4l2-mc.rst     |   0
 .../media}/v4l2-mediabus.rst                  |   0
 .../media}/v4l2-mem2mem.rst                   |   0
 .../kapi => driver-api/media}/v4l2-rect.rst   |   0
 .../kapi => driver-api/media}/v4l2-subdev.rst |   0
 .../kapi => driver-api/media}/v4l2-tuner.rst  |   0
 .../media}/v4l2-tveeprom.rst                  |   0
 .../media}/v4l2-videobuf.rst                  |   0
 .../media}/v4l2-videobuf2.rst                 |   0
 Documentation/fb/api.rst                      |   4 +-
 Documentation/index.rst                       |   1 -
 Documentation/media/cec-drivers/index.rst     |  34 ----
 Documentation/media/index.rst                 |  26 ---
 .../it_IT/doc-guide/parse-headers.rst         |   2 +-
 .../zh_CN/video4linux/omap3isp.txt            |   4 +-
 .../zh_CN/video4linux/v4l2-framework.txt      |   6 +-
 Documentation/userspace-api/index.rst         |   1 +
 .../{ => userspace-api}/media/Makefile        |   2 +-
 .../media/audio.h.rst.exceptions              |   0
 .../media/ca.h.rst.exceptions                 |   0
 .../media/cec.h.rst.exceptions                |   0
 .../media}/cec/cec-api.rst                    |   2 +-
 .../media}/cec/cec-func-close.rst             |   2 +-
 .../media}/cec/cec-func-ioctl.rst             |   2 +-
 .../media}/cec/cec-func-open.rst              |   2 +-
 .../media}/cec/cec-func-poll.rst              |   2 +-
 .../media}/cec/cec-funcs.rst                  |   2 +-
 .../media}/cec/cec-header.rst                 |   2 +-
 .../media}/cec/cec-intro.rst                  |   2 +-
 .../media}/cec/cec-ioc-adap-g-caps.rst        |   2 +-
 .../media}/cec/cec-ioc-adap-g-conn-info.rst   |   0
 .../media}/cec/cec-ioc-adap-g-log-addrs.rst   |   2 +-
 .../media}/cec/cec-ioc-adap-g-phys-addr.rst   |   2 +-
 .../media}/cec/cec-ioc-dqevent.rst            |   2 +-
 .../media}/cec/cec-ioc-g-mode.rst             |   2 +-
 .../media}/cec/cec-ioc-receive.rst            |   2 +-
 .../media}/cec/cec-pin-error-inj.rst          |   2 +-
 .../{ => userspace-api}/media/conf_nitpick.py |   0
 .../media/dmx.h.rst.exceptions                |   0
 .../media/drivers/cx2341x-uapi.rst            | 179 ++++++++++++++++++
 .../userspace-api/media/drivers/imx-uapi.rst  | 125 ++++++++++++
 .../media/drivers}/index.rst                  |  39 +---
 .../media/drivers}/max2175.rst                |   2 +-
 .../userspace-api/media/drivers/meye-uapi.rst |  53 ++++++
 .../media/drivers/omap3isp-uapi.rst}          |  80 +-------
 .../media/drivers}/uvcvideo.rst               |   0
 .../dvb/audio-bilingual-channel-select.rst    |   2 +-
 .../media}/dvb/audio-channel-select.rst       |   2 +-
 .../media}/dvb/audio-clear-buffer.rst         |   2 +-
 .../media}/dvb/audio-continue.rst             |   2 +-
 .../media}/dvb/audio-fclose.rst               |   2 +-
 .../media}/dvb/audio-fopen.rst                |   2 +-
 .../media}/dvb/audio-fwrite.rst               |   2 +-
 .../media}/dvb/audio-get-capabilities.rst     |   2 +-
 .../media}/dvb/audio-get-status.rst           |   2 +-
 .../media}/dvb/audio-pause.rst                |   2 +-
 .../media}/dvb/audio-play.rst                 |   2 +-
 .../media}/dvb/audio-select-source.rst        |   2 +-
 .../media}/dvb/audio-set-av-sync.rst          |   2 +-
 .../media}/dvb/audio-set-bypass-mode.rst      |   2 +-
 .../media}/dvb/audio-set-id.rst               |   2 +-
 .../media}/dvb/audio-set-mixer.rst            |   2 +-
 .../media}/dvb/audio-set-mute.rst             |   2 +-
 .../media}/dvb/audio-set-streamtype.rst       |   2 +-
 .../media}/dvb/audio-stop.rst                 |   2 +-
 .../media}/dvb/audio.rst                      |   2 +-
 .../media}/dvb/audio_data_types.rst           |   2 +-
 .../media}/dvb/audio_function_calls.rst       |   2 +-
 .../media}/dvb/ca-fclose.rst                  |   2 +-
 .../media}/dvb/ca-fopen.rst                   |   2 +-
 .../media}/dvb/ca-get-cap.rst                 |   2 +-
 .../media}/dvb/ca-get-descr-info.rst          |   2 +-
 .../media}/dvb/ca-get-msg.rst                 |   2 +-
 .../media}/dvb/ca-get-slot-info.rst           |   2 +-
 .../media}/dvb/ca-reset.rst                   |   2 +-
 .../media}/dvb/ca-send-msg.rst                |   2 +-
 .../media}/dvb/ca-set-descr.rst               |   2 +-
 .../uapi => userspace-api/media}/dvb/ca.rst   |   3 +-
 .../media}/dvb/ca_data_types.rst              |   2 +-
 .../media}/dvb/ca_function_calls.rst          |   2 +-
 .../media/dvb/ca_high_level.rst}              |  90 +--------
 .../media}/dvb/demux.rst                      |   2 +-
 .../media}/dvb/dmx-add-pid.rst                |   2 +-
 .../media}/dvb/dmx-expbuf.rst                 |   2 +-
 .../media}/dvb/dmx-fclose.rst                 |   2 +-
 .../media}/dvb/dmx-fopen.rst                  |   2 +-
 .../media}/dvb/dmx-fread.rst                  |   2 +-
 .../media}/dvb/dmx-fwrite.rst                 |   2 +-
 .../media}/dvb/dmx-get-pes-pids.rst           |   2 +-
 .../media}/dvb/dmx-get-stc.rst                |   2 +-
 .../media}/dvb/dmx-mmap.rst                   |   2 +-
 .../media}/dvb/dmx-munmap.rst                 |   2 +-
 .../media}/dvb/dmx-qbuf.rst                   |   2 +-
 .../media}/dvb/dmx-querybuf.rst               |   2 +-
 .../media}/dvb/dmx-remove-pid.rst             |   2 +-
 .../media}/dvb/dmx-reqbufs.rst                |   2 +-
 .../media}/dvb/dmx-set-buffer-size.rst        |   2 +-
 .../media}/dvb/dmx-set-filter.rst             |   2 +-
 .../media}/dvb/dmx-set-pes-filter.rst         |   2 +-
 .../media}/dvb/dmx-start.rst                  |   2 +-
 .../media}/dvb/dmx-stop.rst                   |   2 +-
 .../media}/dvb/dmx_fcalls.rst                 |   2 +-
 .../media}/dvb/dmx_types.rst                  |   2 +-
 .../media}/dvb/dvb-fe-read-status.rst         |   2 +-
 .../media}/dvb/dvb-frontend-event.rst         |   2 +-
 .../media}/dvb/dvb-frontend-parameters.rst    |   2 +-
 .../media}/dvb/dvbapi.rst                     |   2 +-
 .../media}/dvb/dvbproperty.rst                |   2 +-
 .../media}/dvb/dvbstb.svg                     |   2 +-
 .../media}/dvb/examples.rst                   |   2 +-
 .../media}/dvb/fe-bandwidth-t.rst             |   2 +-
 .../media}/dvb/fe-diseqc-recv-slave-reply.rst |   2 +-
 .../media}/dvb/fe-diseqc-reset-overload.rst   |   2 +-
 .../media}/dvb/fe-diseqc-send-burst.rst       |   2 +-
 .../media}/dvb/fe-diseqc-send-master-cmd.rst  |   2 +-
 .../dvb/fe-dishnetwork-send-legacy-cmd.rst    |   2 +-
 .../media}/dvb/fe-enable-high-lnb-voltage.rst |   2 +-
 .../media}/dvb/fe-get-event.rst               |   2 +-
 .../media}/dvb/fe-get-frontend.rst            |   2 +-
 .../media}/dvb/fe-get-info.rst                |   2 +-
 .../media}/dvb/fe-get-property.rst            |   2 +-
 .../media}/dvb/fe-read-ber.rst                |   2 +-
 .../media}/dvb/fe-read-signal-strength.rst    |   2 +-
 .../media}/dvb/fe-read-snr.rst                |   2 +-
 .../media}/dvb/fe-read-status.rst             |   2 +-
 .../media}/dvb/fe-read-uncorrected-blocks.rst |   2 +-
 .../media}/dvb/fe-set-frontend-tune-mode.rst  |   2 +-
 .../media}/dvb/fe-set-frontend.rst            |   2 +-
 .../media}/dvb/fe-set-tone.rst                |   2 +-
 .../media}/dvb/fe-set-voltage.rst             |   2 +-
 .../media}/dvb/fe-type-t.rst                  |   2 +-
 .../media}/dvb/fe_property_parameters.rst     |   2 +-
 .../media}/dvb/frontend-header.rst            |   2 +-
 .../dvb/frontend-property-cable-systems.rst   |   2 +-
 .../frontend-property-satellite-systems.rst   |   2 +-
 .../frontend-property-terrestrial-systems.rst |   2 +-
 .../media}/dvb/frontend-stat-properties.rst   |   2 +-
 .../media}/dvb/frontend.rst                   |   2 +-
 .../media}/dvb/frontend_f_close.rst           |   2 +-
 .../media}/dvb/frontend_f_open.rst            |   2 +-
 .../media}/dvb/frontend_fcalls.rst            |   2 +-
 .../media}/dvb/frontend_legacy_api.rst        |   2 +-
 .../media}/dvb/frontend_legacy_dvbv3_api.rst  |   2 +-
 .../media}/dvb/headers.rst                    |   2 +-
 .../media}/dvb/intro.rst                      |   2 +-
 .../media}/dvb/legacy_dvb_apis.rst            |   2 +-
 .../media}/dvb/net-add-if.rst                 |   2 +-
 .../media}/dvb/net-get-if.rst                 |   2 +-
 .../media}/dvb/net-remove-if.rst              |   2 +-
 .../media}/dvb/net-types.rst                  |   2 +-
 .../uapi => userspace-api/media}/dvb/net.rst  |   2 +-
 .../media}/dvb/query-dvb-frontend-info.rst    |   2 +-
 .../media}/dvb/video-clear-buffer.rst         |   2 +-
 .../media}/dvb/video-command.rst              |   2 +-
 .../media}/dvb/video-continue.rst             |   2 +-
 .../media}/dvb/video-fast-forward.rst         |   2 +-
 .../media}/dvb/video-fclose.rst               |   2 +-
 .../media}/dvb/video-fopen.rst                |   2 +-
 .../media}/dvb/video-freeze.rst               |   2 +-
 .../media}/dvb/video-fwrite.rst               |   2 +-
 .../media}/dvb/video-get-capabilities.rst     |   2 +-
 .../media}/dvb/video-get-event.rst            |   2 +-
 .../media}/dvb/video-get-frame-count.rst      |   2 +-
 .../media}/dvb/video-get-pts.rst              |   2 +-
 .../media}/dvb/video-get-size.rst             |   2 +-
 .../media}/dvb/video-get-status.rst           |   2 +-
 .../media}/dvb/video-play.rst                 |   2 +-
 .../media}/dvb/video-select-source.rst        |   2 +-
 .../media}/dvb/video-set-blank.rst            |   2 +-
 .../media}/dvb/video-set-display-format.rst   |   2 +-
 .../media}/dvb/video-set-format.rst           |   2 +-
 .../media}/dvb/video-set-streamtype.rst       |   2 +-
 .../media}/dvb/video-slowmotion.rst           |   2 +-
 .../media}/dvb/video-stillpicture.rst         |   2 +-
 .../media}/dvb/video-stop.rst                 |   2 +-
 .../media}/dvb/video-try-command.rst          |   2 +-
 .../media}/dvb/video.rst                      |   2 +-
 .../media}/dvb/video_function_calls.rst       |   2 +-
 .../media}/dvb/video_types.rst                |   2 +-
 .../media}/fdl-appendix.rst                   |   2 +-
 .../media/frontend.h.rst.exceptions           |   0
 .../media}/gen-errors.rst                     |   2 +-
 .../media/index.rst}                          |  16 +-
 .../{ => userspace-api}/media/intro.rst       |   0
 .../media/lirc.h.rst.exceptions               |   0
 .../media/media.h.rst.exceptions              |   0
 .../mediactl/media-controller-intro.rst       |   2 +-
 .../mediactl/media-controller-model.rst       |   2 +-
 .../media}/mediactl/media-controller.rst      |   2 +-
 .../media}/mediactl/media-func-close.rst      |   2 +-
 .../media}/mediactl/media-func-ioctl.rst      |   2 +-
 .../media}/mediactl/media-func-open.rst       |   2 +-
 .../media}/mediactl/media-funcs.rst           |   2 +-
 .../media}/mediactl/media-header.rst          |   2 +-
 .../media}/mediactl/media-ioc-device-info.rst |   2 +-
 .../mediactl/media-ioc-enum-entities.rst      |   2 +-
 .../media}/mediactl/media-ioc-enum-links.rst  |   2 +-
 .../media}/mediactl/media-ioc-g-topology.rst  |   2 +-
 .../mediactl/media-ioc-request-alloc.rst      |   2 +-
 .../media}/mediactl/media-ioc-setup-link.rst  |   2 +-
 .../mediactl/media-request-ioc-queue.rst      |   2 +-
 .../mediactl/media-request-ioc-reinit.rst     |   2 +-
 .../media}/mediactl/media-types.rst           |   2 +-
 .../media}/mediactl/request-api.rst           |   2 +-
 .../media}/mediactl/request-func-close.rst    |   2 +-
 .../media}/mediactl/request-func-ioctl.rst    |   2 +-
 .../media}/mediactl/request-func-poll.rst     |   2 +-
 .../media/net.h.rst.exceptions                |   0
 .../media}/rc/keytable.c.rst                  |   2 +-
 .../media}/rc/lirc-dev-intro.rst              |   2 +-
 .../media}/rc/lirc-dev.rst                    |   2 +-
 .../media}/rc/lirc-func.rst                   |   2 +-
 .../media}/rc/lirc-get-features.rst           |   2 +-
 .../media}/rc/lirc-get-rec-mode.rst           |   2 +-
 .../media}/rc/lirc-get-rec-resolution.rst     |   2 +-
 .../media}/rc/lirc-get-send-mode.rst          |   2 +-
 .../media}/rc/lirc-get-timeout.rst            |   2 +-
 .../media}/rc/lirc-header.rst                 |   2 +-
 .../media}/rc/lirc-read.rst                   |   2 +-
 .../rc/lirc-set-measure-carrier-mode.rst      |   2 +-
 .../media}/rc/lirc-set-rec-carrier-range.rst  |   2 +-
 .../media}/rc/lirc-set-rec-carrier.rst        |   2 +-
 .../rc/lirc-set-rec-timeout-reports.rst       |   2 +-
 .../media}/rc/lirc-set-rec-timeout.rst        |   2 +-
 .../media}/rc/lirc-set-send-carrier.rst       |   2 +-
 .../media}/rc/lirc-set-send-duty-cycle.rst    |   2 +-
 .../media}/rc/lirc-set-transmitter-mask.rst   |   2 +-
 .../media}/rc/lirc-set-wideband-receiver.rst  |   2 +-
 .../media}/rc/lirc-write.rst                  |   2 +-
 .../media}/rc/rc-intro.rst                    |   2 +-
 .../media}/rc/rc-protos.rst                   |   0
 .../media}/rc/rc-sysfs-nodes.rst              |   2 +-
 .../media}/rc/rc-table-change.rst             |   2 +-
 .../media}/rc/rc-tables.rst                   |   2 +-
 .../media}/rc/remote_controllers.rst          |   2 +-
 .../media/typical_media_device.svg            |   2 +-
 .../media}/v4l/app-pri.rst                    |   2 +-
 .../media}/v4l/async.rst                      |   2 +-
 .../media}/v4l/audio.rst                      |   2 +-
 .../media}/v4l/bayer.svg                      |   2 +-
 .../media}/v4l/biblio.rst                     |   2 +-
 .../media}/v4l/buffer.rst                     |   2 +-
 .../media}/v4l/capture-example.rst            |   2 +-
 .../media}/v4l/capture.c.rst                  |   2 +-
 .../media}/v4l/colorspaces-defs.rst           |   2 +-
 .../media}/v4l/colorspaces-details.rst        |   2 +-
 .../media}/v4l/colorspaces.rst                |   2 +-
 .../media}/v4l/common-defs.rst                |   2 +-
 .../media}/v4l/common.rst                     |   3 +-
 .../media}/v4l/compat.rst                     |   2 +-
 .../media}/v4l/constraints.svg                |   2 +-
 .../media}/v4l/control.rst                    |   2 +-
 .../uapi => userspace-api/media}/v4l/crop.rst |   2 +-
 .../uapi => userspace-api/media}/v4l/crop.svg |   2 +-
 .../media}/v4l/depth-formats.rst              |   2 +-
 .../media}/v4l/dev-capture.rst                |   2 +-
 .../media}/v4l/dev-decoder.rst                |   0
 .../media}/v4l/dev-event.rst                  |   2 +-
 .../media}/v4l/dev-mem2mem.rst                |   2 +-
 .../media}/v4l/dev-meta.rst                   |   2 +-
 .../media}/v4l/dev-osd.rst                    |   2 +-
 .../media}/v4l/dev-output.rst                 |   2 +-
 .../media}/v4l/dev-overlay.rst                |   2 +-
 .../media}/v4l/dev-radio.rst                  |   2 +-
 .../media}/v4l/dev-raw-vbi.rst                |   2 +-
 .../media}/v4l/dev-rds.rst                    |   2 +-
 .../media}/v4l/dev-sdr.rst                    |   2 +-
 .../media}/v4l/dev-sliced-vbi.rst             |   4 +-
 .../media}/v4l/dev-stateless-decoder.rst      |   0
 .../media}/v4l/dev-subdev.rst                 |   2 +-
 .../media}/v4l/dev-touch.rst                  |   2 +-
 .../media}/v4l/devices.rst                    |   2 +-
 .../media}/v4l/diff-v4l.rst                   |   2 +-
 .../media}/v4l/dmabuf.rst                     |   2 +-
 .../media}/v4l/dv-timings.rst                 |   2 +-
 .../media}/v4l/ext-ctrls-camera.rst           |   2 +-
 .../media}/v4l/ext-ctrls-codec.rst            |   4 +-
 .../media}/v4l/ext-ctrls-detect.rst           |   2 +-
 .../media}/v4l/ext-ctrls-dv.rst               |   2 +-
 .../media}/v4l/ext-ctrls-flash.rst            |   2 +-
 .../media}/v4l/ext-ctrls-fm-rx.rst            |   2 +-
 .../media}/v4l/ext-ctrls-fm-tx.rst            |   2 +-
 .../media}/v4l/ext-ctrls-image-process.rst    |   4 +-
 .../media}/v4l/ext-ctrls-image-source.rst     |   2 +-
 .../media}/v4l/ext-ctrls-jpeg.rst             |   2 +-
 .../media}/v4l/ext-ctrls-rf-tuner.rst         |   2 +-
 .../media}/v4l/extended-controls.rst          |   2 +-
 .../media}/v4l/field-order.rst                |   2 +-
 .../media}/v4l/fieldseq_bt.svg                |   2 +-
 .../media}/v4l/fieldseq_tb.svg                |   2 +-
 .../media}/v4l/format.rst                     |   2 +-
 .../media/v4l}/fourcc.rst                     |   0
 .../media}/v4l/func-close.rst                 |   2 +-
 .../media}/v4l/func-ioctl.rst                 |   2 +-
 .../media}/v4l/func-mmap.rst                  |   2 +-
 .../media}/v4l/func-munmap.rst                |   2 +-
 .../media}/v4l/func-open.rst                  |   2 +-
 .../media}/v4l/func-poll.rst                  |   2 +-
 .../media}/v4l/func-read.rst                  |   2 +-
 .../media}/v4l/func-select.rst                |   2 +-
 .../media}/v4l/func-write.rst                 |   2 +-
 .../media}/v4l/hist-v4l2.rst                  |   2 +-
 .../media}/v4l/hsv-formats.rst                |   2 +-
 .../uapi => userspace-api/media}/v4l/io.rst   |   2 +-
 .../media}/v4l/libv4l-introduction.rst        |   2 +-
 .../media}/v4l/libv4l.rst                     |   2 +-
 .../media}/v4l/meta-formats.rst               |   2 +-
 .../uapi => userspace-api/media}/v4l/mmap.rst |   2 +-
 .../media}/v4l/nv12mt.svg                     |   2 +-
 .../media}/v4l/nv12mt_example.svg             |   2 +-
 .../uapi => userspace-api/media}/v4l/open.rst |   2 +-
 .../media}/v4l/pipeline.dot                   |   0
 .../media}/v4l/pixfmt-bayer.rst               |   2 +-
 .../media}/v4l/pixfmt-cnf4.rst                |   0
 .../media}/v4l/pixfmt-compressed.rst          |   2 +-
 .../media}/v4l/pixfmt-grey.rst                |   2 +-
 .../media}/v4l/pixfmt-indexed.rst             |   2 +-
 .../media}/v4l/pixfmt-intro.rst               |   2 +-
 .../media}/v4l/pixfmt-inzi.rst                |   2 +-
 .../media}/v4l/pixfmt-m420.rst                |   2 +-
 .../media}/v4l/pixfmt-meta-d4xx.rst           |   2 +-
 .../media}/v4l/pixfmt-meta-intel-ipu3.rst     |   2 +-
 .../media}/v4l/pixfmt-meta-uvc.rst            |   2 +-
 .../media}/v4l/pixfmt-meta-vivid.rst          |   2 +-
 .../media}/v4l/pixfmt-meta-vsp1-hgo.rst       |   2 +-
 .../media}/v4l/pixfmt-meta-vsp1-hgt.rst       |   2 +-
 .../media}/v4l/pixfmt-nv12.rst                |   2 +-
 .../media}/v4l/pixfmt-nv12m.rst               |   2 +-
 .../media}/v4l/pixfmt-nv12mt.rst              |   2 +-
 .../media}/v4l/pixfmt-nv16.rst                |   2 +-
 .../media}/v4l/pixfmt-nv16m.rst               |   2 +-
 .../media}/v4l/pixfmt-nv24.rst                |   2 +-
 .../media}/v4l/pixfmt-packed-hsv.rst          |   2 +-
 .../media}/v4l/pixfmt-packed-yuv.rst          |   2 +-
 .../media}/v4l/pixfmt-reserved.rst            |   4 +-
 .../media}/v4l/pixfmt-rgb.rst                 |   2 +-
 .../media}/v4l/pixfmt-sdr-cs08.rst            |   2 +-
 .../media}/v4l/pixfmt-sdr-cs14le.rst          |   2 +-
 .../media}/v4l/pixfmt-sdr-cu08.rst            |   2 +-
 .../media}/v4l/pixfmt-sdr-cu16le.rst          |   2 +-
 .../media}/v4l/pixfmt-sdr-pcu16be.rst         |   2 +-
 .../media}/v4l/pixfmt-sdr-pcu18be.rst         |   2 +-
 .../media}/v4l/pixfmt-sdr-pcu20be.rst         |   2 +-
 .../media}/v4l/pixfmt-sdr-ru12le.rst          |   2 +-
 .../media}/v4l/pixfmt-srggb10-ipu3.rst        |   2 +-
 .../media}/v4l/pixfmt-srggb10.rst             |   2 +-
 .../media}/v4l/pixfmt-srggb10alaw8.rst        |   2 +-
 .../media}/v4l/pixfmt-srggb10dpcm8.rst        |   2 +-
 .../media}/v4l/pixfmt-srggb10p.rst            |   2 +-
 .../media}/v4l/pixfmt-srggb12.rst             |   2 +-
 .../media}/v4l/pixfmt-srggb12p.rst            |   2 +-
 .../media}/v4l/pixfmt-srggb14p.rst            |   2 +-
 .../media}/v4l/pixfmt-srggb16.rst             |   2 +-
 .../media}/v4l/pixfmt-srggb8.rst              |   2 +-
 .../media}/v4l/pixfmt-tch-td08.rst            |   2 +-
 .../media}/v4l/pixfmt-tch-td16.rst            |   2 +-
 .../media}/v4l/pixfmt-tch-tu08.rst            |   2 +-
 .../media}/v4l/pixfmt-tch-tu16.rst            |   2 +-
 .../media}/v4l/pixfmt-uv8.rst                 |   2 +-
 .../media}/v4l/pixfmt-uyvy.rst                |   2 +-
 .../media}/v4l/pixfmt-v4l2-mplane.rst         |   2 +-
 .../media}/v4l/pixfmt-v4l2.rst                |   2 +-
 .../media}/v4l/pixfmt-vyuy.rst                |   2 +-
 .../media}/v4l/pixfmt-y10.rst                 |   2 +-
 .../media}/v4l/pixfmt-y10b.rst                |   2 +-
 .../media}/v4l/pixfmt-y10p.rst                |   2 +-
 .../media}/v4l/pixfmt-y12.rst                 |   2 +-
 .../media}/v4l/pixfmt-y12i.rst                |   2 +-
 .../media}/v4l/pixfmt-y16-be.rst              |   2 +-
 .../media}/v4l/pixfmt-y16.rst                 |   2 +-
 .../media}/v4l/pixfmt-y41p.rst                |   2 +-
 .../media}/v4l/pixfmt-y8i.rst                 |   2 +-
 .../media}/v4l/pixfmt-yuv410.rst              |   2 +-
 .../media}/v4l/pixfmt-yuv411p.rst             |   2 +-
 .../media}/v4l/pixfmt-yuv420.rst              |   2 +-
 .../media}/v4l/pixfmt-yuv420m.rst             |   2 +-
 .../media}/v4l/pixfmt-yuv422m.rst             |   2 +-
 .../media}/v4l/pixfmt-yuv422p.rst             |   2 +-
 .../media}/v4l/pixfmt-yuv444m.rst             |   2 +-
 .../media}/v4l/pixfmt-yuyv.rst                |   2 +-
 .../media}/v4l/pixfmt-yvyu.rst                |   2 +-
 .../media}/v4l/pixfmt-z16.rst                 |   2 +-
 .../media}/v4l/pixfmt.rst                     |   2 +-
 .../media}/v4l/planar-apis.rst                |   2 +-
 .../media}/v4l/querycap.rst                   |   2 +-
 .../uapi => userspace-api/media}/v4l/rw.rst   |   2 +-
 .../media}/v4l/sdr-formats.rst                |   2 +-
 .../v4l/selection-api-configuration.rst       |   2 +-
 .../media}/v4l/selection-api-examples.rst     |   2 +-
 .../media}/v4l/selection-api-intro.rst        |   2 +-
 .../media}/v4l/selection-api-targets.rst      |   2 +-
 .../media}/v4l/selection-api-vs-crop-api.rst  |   2 +-
 .../media}/v4l/selection-api.rst              |   2 +-
 .../media}/v4l/selection.svg                  |   2 +-
 .../media}/v4l/selections-common.rst          |   2 +-
 .../media}/v4l/standard.rst                   |   2 +-
 .../media}/v4l/streaming-par.rst              |   2 +-
 .../media}/v4l/subdev-formats.rst             |   2 +-
 .../v4l/subdev-image-processing-crop.svg      |   2 +-
 .../v4l/subdev-image-processing-full.svg      |   2 +-
 ...-image-processing-scaling-multi-source.svg |   2 +-
 .../media}/v4l/tch-formats.rst                |   2 +-
 .../media}/v4l/tuner.rst                      |   2 +-
 .../media}/v4l/user-func.rst                  |   2 +-
 .../media}/v4l/userp.rst                      |   2 +-
 .../media}/v4l/v4l2-selection-flags.rst       |   2 +-
 .../media}/v4l/v4l2-selection-targets.rst     |   2 +-
 .../uapi => userspace-api/media}/v4l/v4l2.rst |   2 +-
 .../media}/v4l/v4l2grab-example.rst           |   2 +-
 .../media}/v4l/v4l2grab.c.rst                 |   2 +-
 .../media}/v4l/vbi_525.svg                    |   2 +-
 .../media}/v4l/vbi_625.svg                    |   2 +-
 .../media}/v4l/vbi_hsync.svg                  |   2 +-
 .../media}/v4l/video.rst                      |   2 +-
 .../media}/v4l/videodev.rst                   |   2 +-
 .../media}/v4l/vidioc-create-bufs.rst         |   2 +-
 .../media}/v4l/vidioc-cropcap.rst             |   2 +-
 .../media}/v4l/vidioc-dbg-g-chip-info.rst     |   2 +-
 .../media}/v4l/vidioc-dbg-g-register.rst      |   2 +-
 .../media}/v4l/vidioc-decoder-cmd.rst         |   2 +-
 .../media}/v4l/vidioc-dqevent.rst             |   2 +-
 .../media}/v4l/vidioc-dv-timings-cap.rst      |   2 +-
 .../media}/v4l/vidioc-encoder-cmd.rst         |   2 +-
 .../media}/v4l/vidioc-enum-dv-timings.rst     |   2 +-
 .../media}/v4l/vidioc-enum-fmt.rst            |   2 +-
 .../media}/v4l/vidioc-enum-frameintervals.rst |   2 +-
 .../media}/v4l/vidioc-enum-framesizes.rst     |   2 +-
 .../media}/v4l/vidioc-enum-freq-bands.rst     |   2 +-
 .../media}/v4l/vidioc-enumaudio.rst           |   2 +-
 .../media}/v4l/vidioc-enumaudioout.rst        |   2 +-
 .../media}/v4l/vidioc-enuminput.rst           |   2 +-
 .../media}/v4l/vidioc-enumoutput.rst          |   2 +-
 .../media}/v4l/vidioc-enumstd.rst             |   2 +-
 .../media}/v4l/vidioc-expbuf.rst              |   2 +-
 .../media}/v4l/vidioc-g-audio.rst             |   2 +-
 .../media}/v4l/vidioc-g-audioout.rst          |   2 +-
 .../media}/v4l/vidioc-g-crop.rst              |   2 +-
 .../media}/v4l/vidioc-g-ctrl.rst              |   2 +-
 .../media}/v4l/vidioc-g-dv-timings.rst        |   2 +-
 .../media}/v4l/vidioc-g-edid.rst              |   2 +-
 .../media}/v4l/vidioc-g-enc-index.rst         |   2 +-
 .../media}/v4l/vidioc-g-ext-ctrls.rst         |   2 +-
 .../media}/v4l/vidioc-g-fbuf.rst              |   2 +-
 .../media}/v4l/vidioc-g-fmt.rst               |   2 +-
 .../media}/v4l/vidioc-g-frequency.rst         |   2 +-
 .../media}/v4l/vidioc-g-input.rst             |   2 +-
 .../media}/v4l/vidioc-g-jpegcomp.rst          |   2 +-
 .../media}/v4l/vidioc-g-modulator.rst         |   2 +-
 .../media}/v4l/vidioc-g-output.rst            |   2 +-
 .../media}/v4l/vidioc-g-parm.rst              |   2 +-
 .../media}/v4l/vidioc-g-priority.rst          |   2 +-
 .../media}/v4l/vidioc-g-selection.rst         |   2 +-
 .../media}/v4l/vidioc-g-sliced-vbi-cap.rst    |   2 +-
 .../media}/v4l/vidioc-g-std.rst               |   2 +-
 .../media}/v4l/vidioc-g-tuner.rst             |   2 +-
 .../media}/v4l/vidioc-log-status.rst          |   2 +-
 .../media}/v4l/vidioc-overlay.rst             |   2 +-
 .../media}/v4l/vidioc-prepare-buf.rst         |   2 +-
 .../media}/v4l/vidioc-qbuf.rst                |   2 +-
 .../media}/v4l/vidioc-query-dv-timings.rst    |   2 +-
 .../media}/v4l/vidioc-querybuf.rst            |   2 +-
 .../media}/v4l/vidioc-querycap.rst            |   2 +-
 .../media}/v4l/vidioc-queryctrl.rst           |   2 +-
 .../media}/v4l/vidioc-querystd.rst            |   2 +-
 .../media}/v4l/vidioc-reqbufs.rst             |   2 +-
 .../media}/v4l/vidioc-s-hw-freq-seek.rst      |   2 +-
 .../media}/v4l/vidioc-streamon.rst            |   2 +-
 .../v4l/vidioc-subdev-enum-frame-interval.rst |   2 +-
 .../v4l/vidioc-subdev-enum-frame-size.rst     |   2 +-
 .../v4l/vidioc-subdev-enum-mbus-code.rst      |   2 +-
 .../media}/v4l/vidioc-subdev-g-crop.rst       |   2 +-
 .../media}/v4l/vidioc-subdev-g-fmt.rst        |   2 +-
 .../v4l/vidioc-subdev-g-frame-interval.rst    |   2 +-
 .../media}/v4l/vidioc-subdev-g-selection.rst  |   2 +-
 .../media}/v4l/vidioc-subscribe-event.rst     |   2 +-
 .../media}/v4l/yuv-formats.rst                |   2 +-
 .../media/video.h.rst.exceptions              |   0
 .../media/videodev2.h.rst.exceptions          |   0
 MAINTAINERS                                   |  46 +++--
 drivers/media/dvb-frontends/dib3000.h         |   2 +-
 drivers/media/dvb-frontends/dib3000mb.c       |   2 +-
 drivers/media/dvb-frontends/eds1547.h         |   2 +-
 drivers/media/dvb-frontends/z0194a.h          |   2 +-
 drivers/media/i2c/max2175.c                   |   6 +-
 drivers/media/pci/bt8xx/Kconfig               |   2 +-
 drivers/media/pci/cx18/cx18-streams.c         |   4 +-
 drivers/media/pci/meye/Kconfig                |   2 +-
 drivers/media/platform/pxa_camera.c           |   4 +-
 drivers/media/radio/Kconfig                   |  12 +-
 drivers/media/radio/si470x/Kconfig            |   2 +-
 drivers/media/radio/wl128x/Kconfig            |   2 +-
 drivers/media/usb/dvb-usb-v2/Kconfig          |   2 +-
 drivers/media/usb/dvb-usb-v2/gl861.c          |   2 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c        |   4 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.h        |   2 +-
 drivers/media/usb/dvb-usb-v2/mxl111sf.c       |   2 +-
 drivers/media/usb/dvb-usb-v2/mxl111sf.h       |   2 +-
 drivers/media/usb/dvb-usb/Kconfig             |   2 +-
 drivers/media/usb/dvb-usb/a800.c              |   2 +-
 drivers/media/usb/dvb-usb/af9005-fe.c         |   2 +-
 drivers/media/usb/dvb-usb/af9005-remote.c     |   2 +-
 drivers/media/usb/dvb-usb/af9005.c            |   2 +-
 drivers/media/usb/dvb-usb/af9005.h            |   2 +-
 drivers/media/usb/dvb-usb/az6027.c            |   2 +-
 drivers/media/usb/dvb-usb/cxusb.c             |   2 +-
 drivers/media/usb/dvb-usb/dibusb-common.c     |   2 +-
 drivers/media/usb/dvb-usb/dibusb-mb.c         |   2 +-
 drivers/media/usb/dvb-usb/dibusb-mc-common.c  |   2 +-
 drivers/media/usb/dvb-usb/dibusb-mc.c         |   2 +-
 drivers/media/usb/dvb-usb/dibusb.h            |   2 +-
 drivers/media/usb/dvb-usb/digitv.c            |   2 +-
 drivers/media/usb/dvb-usb/dtt200u-fe.c        |   2 +-
 drivers/media/usb/dvb-usb/dtt200u.c           |   2 +-
 drivers/media/usb/dvb-usb/dtt200u.h           |   2 +-
 drivers/media/usb/dvb-usb/dvb-usb-init.c      |   2 +-
 drivers/media/usb/dvb-usb/dw2102.c            |   2 +-
 drivers/media/usb/dvb-usb/gp8psk.c            |   2 +-
 drivers/media/usb/dvb-usb/gp8psk.h            |   2 +-
 drivers/media/usb/dvb-usb/m920x.c             |   2 +-
 drivers/media/usb/dvb-usb/nova-t-usb2.c       |   2 +-
 drivers/media/usb/dvb-usb/opera1.c            |   2 +-
 drivers/media/usb/dvb-usb/ttusb2.c            |   2 +-
 drivers/media/usb/dvb-usb/ttusb2.h            |   2 +-
 drivers/media/usb/dvb-usb/umt-010.c           |   2 +-
 drivers/media/usb/dvb-usb/vp702x-fe.c         |   2 +-
 drivers/media/usb/dvb-usb/vp702x.c            |   2 +-
 drivers/media/usb/dvb-usb/vp7045-fe.c         |   2 +-
 drivers/media/usb/dvb-usb/vp7045.c            |   2 +-
 drivers/media/usb/dvb-usb/vp7045.h            |   2 +-
 drivers/media/usb/gspca/Kconfig               |   2 +-
 drivers/media/usb/zr364xx/Kconfig             |   2 +-
 .../staging/media/soc_camera}/soc-camera.rst  |   0
 633 files changed, 1639 insertions(+), 1458 deletions(-)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/au0828-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/avermedia.rst (99%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/bt8xx.rst (93%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv.rst (90%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cafe_ccic.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/cards.rst (100%)
 create mode 100644 Documentation/admin-guide/media/ci.rst
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cpia2.rst (68%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cx23885-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cx88-cardlist.rst (100%)
 create mode 100644 Documentation/admin-guide/media/cx88.rst
 rename Documentation/{media/v4l-drivers => admin-guide/media}/davinci-vpbe.rst (72%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/em28xx-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/faq.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/fimc.rst (91%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/gspca-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/imx.rst (87%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/imx7.rst (100%)
 create mode 100644 Documentation/admin-guide/media/index.rst
 rename Documentation/{media/dvb-drivers => admin-guide/media}/intro.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3_rcb.svg (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/lmedm04.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/meye.rst (63%)
 create mode 100644 Documentation/admin-guide/media/omap3isp.rst
 rename Documentation/{media/v4l-drivers => admin-guide/media}/omap4_camera.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/opera-firmware.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/philips.rst (100%)
 rename Documentation/{media/cec-drivers => admin-guide/media}/pulse8-cec.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_8x96_graph.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_graph.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/rcar-fdp1.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7134-cardlist.rst (100%)
 create mode 100644 Documentation/admin-guide/media/saa7134.rst
 rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7164-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si470x.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si4713.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si476x.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/technisat.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/tm6000-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/ttusb-dec.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/tuner-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/udev.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/usbvision-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/v4l-with-ir.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.rst (92%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vivid.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/zr364xx.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/cec-core.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/csi2.rst (100%)
 create mode 100644 Documentation/driver-api/media/drivers/bttv-devel.rst
 rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/contributors.rst (100%)
 create mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst
 rename Documentation/{media/v4l-drivers/cx2341x.rst => driver-api/media/drivers/cx2341x-devel.rst} (91%)
 rename Documentation/{media/v4l-drivers/cx88.rst => driver-api/media/drivers/cx88-devel.rst} (66%)
 create mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
 rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/dvb-usb.rst (100%)
 create mode 100644 Documentation/driver-api/media/drivers/fimc-devel.rst
 rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/frontends.rst (100%)
 rename Documentation/{media/dvb-drivers => driver-api/media/drivers}/index.rst (67%)
 rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pvrusb2.rst (100%)
 rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/pxa_camera.rst (100%)
 rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/radiotrack.rst (100%)
 rename Documentation/{media/v4l-drivers/saa7134.rst => driver-api/media/drivers/saa7134-devel.rst} (56%)
 rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/sh_mobile_ceu_camera.rst (100%)
 rename Documentation/{media/v4l-drivers => driver-api/media/drivers}/tuners.rst (100%)
 create mode 100644 Documentation/driver-api/media/drivers/vimc-devel.rst
 rename Documentation/{media/kapi => driver-api/media}/dtv-ca.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/dtv-common.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/dtv-core.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/dtv-demux.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/dtv-frontend.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/dtv-net.rst (100%)
 rename Documentation/{media/media_kapi.rst => driver-api/media/index.rst} (89%)
 rename Documentation/{media/kapi => driver-api/media}/mc-core.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/rc-core.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-async.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-clocks.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-common.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-controls.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-core.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-dev.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-device.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-dv-timings.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-event.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-fh.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-flash-led-class.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-fwnode.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-intro.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-mc.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-mediabus.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-mem2mem.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-rect.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-subdev.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-tuner.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-tveeprom.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf.rst (100%)
 rename Documentation/{media/kapi => driver-api/media}/v4l2-videobuf2.rst (100%)
 delete mode 100644 Documentation/media/cec-drivers/index.rst
 delete mode 100644 Documentation/media/index.rst
 rename Documentation/{ => userspace-api}/media/Makefile (97%)
 rename Documentation/{ => userspace-api}/media/audio.h.rst.exceptions (100%)
 rename Documentation/{ => userspace-api}/media/ca.h.rst.exceptions (100%)
 rename Documentation/{ => userspace-api}/media/cec.h.rst.exceptions (100%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-api.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-close.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-ioctl.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-open.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-func-poll.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-funcs.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-header.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-intro.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-caps.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-conn-info.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-log-addrs.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-adap-g-phys-addr.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-dqevent.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-g-mode.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-ioc-receive.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/cec/cec-pin-error-inj.rst (99%)
 rename Documentation/{ => userspace-api}/media/conf_nitpick.py (100%)
 rename Documentation/{ => userspace-api}/media/dmx.h.rst.exceptions (100%)
 create mode 100644 Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
 create mode 100644 Documentation/userspace-api/media/drivers/imx-uapi.rst
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/index.rst (73%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/max2175.rst (96%)
 create mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst
 rename Documentation/{media/v4l-drivers/omap3isp.rst => userspace-api/media/drivers/omap3isp-uapi.rst} (77%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/uvcvideo.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-bilingual-channel-select.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-channel-select.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-clear-buffer.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-continue.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fclose.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fopen.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-fwrite.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-capabilities.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-get-status.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-pause.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-play.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-select-source.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-av-sync.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-bypass-mode.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-id.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mixer.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-mute.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-set-streamtype.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio-stop.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_data_types.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/audio_function_calls.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fclose.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-fopen.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-cap.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-descr-info.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-msg.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-get-slot-info.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-reset.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-send-msg.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca-set-descr.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_data_types.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/ca_function_calls.rst (92%)
 rename Documentation/{media/dvb-drivers/ci.rst => userspace-api/media/dvb/ca_high_level.rst} (68%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/demux.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-add-pid.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-expbuf.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fclose.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fopen.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fread.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-fwrite.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-pes-pids.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-get-stc.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-mmap.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-munmap.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-qbuf.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-querybuf.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-remove-pid.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-reqbufs.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-buffer-size.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-filter.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-set-pes-filter.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-start.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx-stop.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_fcalls.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dmx_types.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-fe-read-status.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-event.rst (91%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvb-frontend-parameters.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbapi.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbproperty.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/dvbstb.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/examples.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-bandwidth-t.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-recv-slave-reply.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-reset-overload.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-burst.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-diseqc-send-master-cmd.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-dishnetwork-send-legacy-cmd.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-enable-high-lnb-voltage.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-event.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-frontend.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-info.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-get-property.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-ber.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-signal-strength.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-snr.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-status.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-read-uncorrected-blocks.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend-tune-mode.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-frontend.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-tone.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-set-voltage.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe-type-t.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/fe_property_parameters.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-header.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-cable-systems.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-satellite-systems.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-property-terrestrial-systems.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend-stat-properties.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_close.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_f_open.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_fcalls.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_api.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/frontend_legacy_dvbv3_api.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/headers.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/intro.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/legacy_dvb_apis.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/net-add-if.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/net-get-if.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/net-remove-if.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/net-types.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/net.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/query-dvb-frontend-info.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-clear-buffer.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-command.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-continue.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fast-forward.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fclose.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fopen.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-freeze.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-fwrite.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-capabilities.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-event.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-frame-count.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-pts.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-size.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-get-status.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-play.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-select-source.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-blank.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-display-format.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-format.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-set-streamtype.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-slowmotion.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stillpicture.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-stop.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video-try-command.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video_function_calls.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/dvb/video_types.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/fdl-appendix.rst (99%)
 rename Documentation/{ => userspace-api}/media/frontend.h.rst.exceptions (100%)
 rename Documentation/{media/uapi => userspace-api/media}/gen-errors.rst (98%)
 rename Documentation/{media/media_uapi.rst => userspace-api/media/index.rst} (80%)
 rename Documentation/{ => userspace-api}/media/intro.rst (100%)
 rename Documentation/{ => userspace-api}/media/lirc.h.rst.exceptions (100%)
 rename Documentation/{ => userspace-api}/media/media.h.rst.exceptions (100%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-intro.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller-model.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-controller.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-close.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-ioctl.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-func-open.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-funcs.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-header.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-device-info.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-entities.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-enum-links.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-g-topology.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-request-alloc.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-ioc-setup-link.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-queue.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-request-ioc-reinit.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/media-types.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-api.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-close.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-ioctl.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/mediactl/request-func-poll.rst (98%)
 rename Documentation/{ => userspace-api}/media/net.h.rst.exceptions (100%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/keytable.c.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev-intro.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-dev.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-func.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-features.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-mode.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-rec-resolution.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-send-mode.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-get-timeout.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-header.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-read.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-measure-carrier-mode.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier-range.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-carrier.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout-reports.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-rec-timeout.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-carrier.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-send-duty-cycle.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-transmitter-mask.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-set-wideband-receiver.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/lirc-write.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/rc-intro.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/rc-protos.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/rc-sysfs-nodes.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/rc-table-change.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/rc-tables.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/rc/remote_controllers.rst (95%)
 rename Documentation/{ => userspace-api}/media/typical_media_device.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/app-pri.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/async.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/audio.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/bayer.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/biblio.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/buffer.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/capture-example.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/capture.c.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-defs.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces-details.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/colorspaces.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/common-defs.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/common.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/compat.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/constraints.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/control.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/crop.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/depth-formats.rst (91%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-capture.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-decoder.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-event.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-mem2mem.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-meta.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-osd.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-output.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-overlay.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-radio.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-raw-vbi.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-rds.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sdr.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-sliced-vbi.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-stateless-decoder.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-subdev.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dev-touch.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/devices.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/diff-v4l.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dmabuf.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/dv-timings.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-camera.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-codec.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-detect.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-dv.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-flash.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-rx.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-fm-tx.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-process.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-image-source.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-jpeg.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/ext-ctrls-rf-tuner.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/extended-controls.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/field-order.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_bt.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/fieldseq_tb.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/format.rst (98%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/v4l}/fourcc.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-close.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-ioctl.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-mmap.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-munmap.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-open.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-poll.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-read.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-select.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/func-write.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/hist-v4l2.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/hsv-formats.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/io.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l-introduction.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/libv4l.rst (90%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/meta-formats.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/mmap.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/nv12mt_example.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/open.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pipeline.dot (100%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-bayer.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-cnf4.rst (100%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-compressed.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-grey.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-indexed.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-intro.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-inzi.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-m420.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-d4xx.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-intel-ipu3.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-uvc.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vivid.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgo.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-meta-vsp1-hgt.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12m.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv12mt.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv16m.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-nv24.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-hsv.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-packed-yuv.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-reserved.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-rgb.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs08.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cs14le.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu08.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-cu16le.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu16be.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu18be.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-pcu20be.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-sdr-ru12le.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10-ipu3.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10alaw8.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10dpcm8.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb10p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb12p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb14p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb16.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-srggb8.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td08.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-td16.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu08.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-tch-tu16.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uv8.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-uyvy.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2-mplane.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-v4l2.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-vyuy.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10b.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y10p.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y12i.rst (95%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16-be.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y16.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y41p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-y8i.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv410.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv411p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv420m.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422m.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv422p.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuv444m.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yuyv.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-yvyu.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt-z16.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/pixfmt.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/planar-apis.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/querycap.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/rw.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/sdr-formats.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-configuration.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-examples.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-intro.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-targets.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api-vs-crop-api.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection-api.rst (92%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selection.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/selections-common.rst (94%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/standard.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/streaming-par.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-formats.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-crop.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-full.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/subdev-image-processing-scaling-multi-source.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/tch-formats.rst (91%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/tuner.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/user-func.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/userp.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-flags.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2-selection-targets.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab-example.rst (93%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/v4l2grab.c.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_525.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_625.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vbi_hsync.svg (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/video.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/videodev.rst (91%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-create-bufs.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-cropcap.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-chip-info.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dbg-g-register.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-decoder-cmd.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dqevent.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-dv-timings-cap.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-encoder-cmd.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-dv-timings.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-fmt.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-frameintervals.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-framesizes.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enum-freq-bands.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudio.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumaudioout.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enuminput.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumoutput.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-enumstd.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-expbuf.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audio.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-audioout.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-crop.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ctrl.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-dv-timings.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-edid.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-enc-index.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-ext-ctrls.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fbuf.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-fmt.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-frequency.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-input.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-jpegcomp.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-modulator.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-output.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-parm.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-priority.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-selection.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-sliced-vbi-cap.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-std.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-g-tuner.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-log-status.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-overlay.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-prepare-buf.rst (96%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-qbuf.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-query-dv-timings.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querybuf.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querycap.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-queryctrl.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-querystd.rst (97%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-reqbufs.rst (99%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-s-hw-freq-seek.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-streamon.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-interval.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-frame-size.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-enum-mbus-code.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-crop.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-fmt.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-frame-interval.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subdev-g-selection.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/vidioc-subscribe-event.rst (98%)
 rename Documentation/{media/uapi => userspace-api/media}/v4l/yuv-formats.rst (97%)
 rename Documentation/{ => userspace-api}/media/video.h.rst.exceptions (100%)
 rename Documentation/{ => userspace-api}/media/videodev2.h.rst.exceptions (100%)
 rename {Documentation/media/v4l-drivers => drivers/staging/media/soc_camera}/soc-camera.rst (100%)

-- 
2.24.1



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 15/22] media: docs: split uAPI info from imx.rst
  2020-03-10 13:42 [PATCH v2 00/22] Move media documentation files Mauro Carvalho Chehab
@ 2020-03-10 13:43 ` Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff Mauro Carvalho Chehab
  2 siblings, 0 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2020-03-10 13:43 UTC (permalink / raw)
  To: Linux Doc Mailing List
  Cc: Jonathan Corbet, Mauro Carvalho Chehab, Fabio Estevam,
	Sascha Hauer, linux-kernel, NXP Linux Team,
	Pengutronix Kernel Team, Shawn Guo, linux-arm-kernel, linux-media

This file contains both driver develompent documentation and
userspace API.

Split on two, as they're usually read by different audiences.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 Documentation/media/v4l-drivers/imx-uapi.rst | 125 +++++++++++++++++++
 Documentation/media/v4l-drivers/imx.rst      |  88 +------------
 Documentation/media/v4l-drivers/index.rst    |   1 +
 3 files changed, 128 insertions(+), 86 deletions(-)
 create mode 100644 Documentation/media/v4l-drivers/imx-uapi.rst

diff --git a/Documentation/media/v4l-drivers/imx-uapi.rst b/Documentation/media/v4l-drivers/imx-uapi.rst
new file mode 100644
index 000000000000..8d47712dea9f
--- /dev/null
+++ b/Documentation/media/v4l-drivers/imx-uapi.rst
@@ -0,0 +1,125 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+=========================
+i.MX Video Capture Driver
+=========================
+
+Events
+======
+
+.. _imx_api_ipuX_csiY:
+
+ipuX_csiY
+---------
+
+This subdev can generate the following event when enabling the second
+IDMAC source pad:
+
+- V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR
+
+The user application can subscribe to this event from the ipuX_csiY
+subdev node. This event is generated by the Frame Interval Monitor
+(see below for more on the FIM).
+
+Controls
+========
+
+.. _imx_api_FIM:
+
+Frame Interval Monitor in ipuX_csiY
+-----------------------------------
+
+The adv718x decoders can occasionally send corrupt fields during
+NTSC/PAL signal re-sync (too little or too many video lines). When
+this happens, the IPU triggers a mechanism to re-establish vertical
+sync by adding 1 dummy line every frame, which causes a rolling effect
+from image to image, and can last a long time before a stable image is
+recovered. Or sometimes the mechanism doesn't work at all, causing a
+permanent split image (one frame contains lines from two consecutive
+captured images).
+
+From experiment it was found that during image rolling, the frame
+intervals (elapsed time between two EOF's) drop below the nominal
+value for the current standard, by about one frame time (60 usec),
+and remain at that value until rolling stops.
+
+While the reason for this observation isn't known (the IPU dummy
+line mechanism should show an increase in the intervals by 1 line
+time every frame, not a fixed value), we can use it to detect the
+corrupt fields using a frame interval monitor. If the FIM detects a
+bad frame interval, the ipuX_csiY subdev will send the event
+V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR. Userland can register with
+the FIM event notification on the ipuX_csiY subdev device node.
+Userland can issue a streaming restart when this event is received
+to correct the rolling/split image.
+
+The ipuX_csiY subdev includes custom controls to tweak some dials for
+FIM. If one of these controls is changed during streaming, the FIM will
+be reset and will continue at the new settings.
+
+- V4L2_CID_IMX_FIM_ENABLE
+
+Enable/disable the FIM.
+
+- V4L2_CID_IMX_FIM_NUM
+
+How many frame interval measurements to average before comparing against
+the nominal frame interval reported by the sensor. This can reduce noise
+caused by interrupt latency.
+
+- V4L2_CID_IMX_FIM_TOLERANCE_MIN
+
+If the averaged intervals fall outside nominal by this amount, in
+microseconds, the V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR event is sent.
+
+- V4L2_CID_IMX_FIM_TOLERANCE_MAX
+
+If any intervals are higher than this value, those samples are
+discarded and do not enter into the average. This can be used to
+discard really high interval errors that might be due to interrupt
+latency from high system load.
+
+- V4L2_CID_IMX_FIM_NUM_SKIP
+
+How many frames to skip after a FIM reset or stream restart before
+FIM begins to average intervals.
+
+- V4L2_CID_IMX_FIM_ICAP_CHANNEL / V4L2_CID_IMX_FIM_ICAP_EDGE
+
+These controls will configure an input capture channel as the method
+for measuring frame intervals. This is superior to the default method
+of measuring frame intervals via EOF interrupt, since it is not subject
+to uncertainty errors introduced by interrupt latency.
+
+Input capture requires hardware support. A VSYNC signal must be routed
+to one of the i.MX6 input capture channel pads.
+
+V4L2_CID_IMX_FIM_ICAP_CHANNEL configures which i.MX6 input capture
+channel to use. This must be 0 or 1.
+
+V4L2_CID_IMX_FIM_ICAP_EDGE configures which signal edge will trigger
+input capture events. By default the input capture method is disabled
+with a value of IRQ_TYPE_NONE. Set this control to IRQ_TYPE_EDGE_RISING,
+IRQ_TYPE_EDGE_FALLING, or IRQ_TYPE_EDGE_BOTH to enable input capture,
+triggered on the given signal edge(s).
+
+When input capture is disabled, frame intervals will be measured via
+EOF interrupt.
+
+
+File list
+---------
+
+drivers/staging/media/imx/
+include/media/imx.h
+include/linux/imx-media.h
+
+
+Authors
+-------
+
+- Steve Longerbeam <steve_longerbeam@mentor.com>
+- Philipp Zabel <kernel@pengutronix.de>
+- Russell King <linux@armlinux.org.uk>
+
+Copyright (C) 2012-2017 Mentor Graphics Inc.
diff --git a/Documentation/media/v4l-drivers/imx.rst b/Documentation/media/v4l-drivers/imx.rst
index 1246573c1019..3182951c7651 100644
--- a/Documentation/media/v4l-drivers/imx.rst
+++ b/Documentation/media/v4l-drivers/imx.rst
@@ -191,14 +191,7 @@ or unqualified interlaced). The capture interface will enforce the same
 field order as the source pad field order (interlaced-bt if source pad
 is seq-bt, interlaced-tb if source pad is seq-tb).
 
-This subdev can generate the following event when enabling the second
-IDMAC source pad:
-
-- V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR
-
-The user application can subscribe to this event from the ipuX_csiY
-subdev node. This event is generated by the Frame Interval Monitor
-(see below for more on the FIM).
+For events produced by ipuX_csiY, see ref:`imx_api_ipuX_csiY`.
 
 Cropping in ipuX_csiY
 ---------------------
@@ -247,84 +240,7 @@ rate by half at the IDMAC output source pad:
 Frame Interval Monitor in ipuX_csiY
 -----------------------------------
 
-The adv718x decoders can occasionally send corrupt fields during
-NTSC/PAL signal re-sync (too little or too many video lines). When
-this happens, the IPU triggers a mechanism to re-establish vertical
-sync by adding 1 dummy line every frame, which causes a rolling effect
-from image to image, and can last a long time before a stable image is
-recovered. Or sometimes the mechanism doesn't work at all, causing a
-permanent split image (one frame contains lines from two consecutive
-captured images).
-
-From experiment it was found that during image rolling, the frame
-intervals (elapsed time between two EOF's) drop below the nominal
-value for the current standard, by about one frame time (60 usec),
-and remain at that value until rolling stops.
-
-While the reason for this observation isn't known (the IPU dummy
-line mechanism should show an increase in the intervals by 1 line
-time every frame, not a fixed value), we can use it to detect the
-corrupt fields using a frame interval monitor. If the FIM detects a
-bad frame interval, the ipuX_csiY subdev will send the event
-V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR. Userland can register with
-the FIM event notification on the ipuX_csiY subdev device node.
-Userland can issue a streaming restart when this event is received
-to correct the rolling/split image.
-
-The ipuX_csiY subdev includes custom controls to tweak some dials for
-FIM. If one of these controls is changed during streaming, the FIM will
-be reset and will continue at the new settings.
-
-- V4L2_CID_IMX_FIM_ENABLE
-
-Enable/disable the FIM.
-
-- V4L2_CID_IMX_FIM_NUM
-
-How many frame interval measurements to average before comparing against
-the nominal frame interval reported by the sensor. This can reduce noise
-caused by interrupt latency.
-
-- V4L2_CID_IMX_FIM_TOLERANCE_MIN
-
-If the averaged intervals fall outside nominal by this amount, in
-microseconds, the V4L2_EVENT_IMX_FRAME_INTERVAL_ERROR event is sent.
-
-- V4L2_CID_IMX_FIM_TOLERANCE_MAX
-
-If any intervals are higher than this value, those samples are
-discarded and do not enter into the average. This can be used to
-discard really high interval errors that might be due to interrupt
-latency from high system load.
-
-- V4L2_CID_IMX_FIM_NUM_SKIP
-
-How many frames to skip after a FIM reset or stream restart before
-FIM begins to average intervals.
-
-- V4L2_CID_IMX_FIM_ICAP_CHANNEL
-- V4L2_CID_IMX_FIM_ICAP_EDGE
-
-These controls will configure an input capture channel as the method
-for measuring frame intervals. This is superior to the default method
-of measuring frame intervals via EOF interrupt, since it is not subject
-to uncertainty errors introduced by interrupt latency.
-
-Input capture requires hardware support. A VSYNC signal must be routed
-to one of the i.MX6 input capture channel pads.
-
-V4L2_CID_IMX_FIM_ICAP_CHANNEL configures which i.MX6 input capture
-channel to use. This must be 0 or 1.
-
-V4L2_CID_IMX_FIM_ICAP_EDGE configures which signal edge will trigger
-input capture events. By default the input capture method is disabled
-with a value of IRQ_TYPE_NONE. Set this control to IRQ_TYPE_EDGE_RISING,
-IRQ_TYPE_EDGE_FALLING, or IRQ_TYPE_EDGE_BOTH to enable input capture,
-triggered on the given signal edge(s).
-
-When input capture is disabled, frame intervals will be measured via
-EOF interrupt.
-
+See ref:`imx_api_FIM`.
 
 ipuX_vdic
 ---------
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index 364c65ea86fb..67665a8abe02 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -75,5 +75,6 @@ For more details see the file COPYING in the source distribution of Linux.
 	vimc-devel
 
 	cx2341x-uapi
+	imx-uapi
 	meye-uapi
 	omap3isp-uapi
-- 
2.24.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide
  2020-03-10 13:42 [PATCH v2 00/22] Move media documentation files Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 15/22] media: docs: split uAPI info from imx.rst Mauro Carvalho Chehab
@ 2020-03-10 13:43 ` Mauro Carvalho Chehab
  2020-03-12  7:25   ` Hans Verkuil
  2020-03-10 13:43 ` [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff Mauro Carvalho Chehab
  2 siblings, 1 reply; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2020-03-10 13:43 UTC (permalink / raw)
  To: Linux Doc Mailing List
  Cc: Todor Tomov, Hans Verkuil, Harry Wei, Alex Shi, Fabio Estevam,
	Jonathan Corbet, Mauro Carvalho Chehab, NXP Linux Team,
	Steve Longerbeam, Philipp Zabel, linux-media, Sakari Ailus,
	Malcolm Priestley, Sascha Hauer, Rui Miguel Silva,
	linux-arm-kernel, Antoine Jacquet, Andy Walls, linux-usb,
	linux-kernel, Pengutronix Kernel Team, Shawn Guo

Most of the driver-specific documentation is meant to help
users of the media subsystem.

Move them to the admin-guide.

It should be noticed, however, that several of those files
are outdated and will require further work in order to make
them useful again.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 Documentation/admin-guide/index.rst           |   1 +
 .../admin-guide/kernel-parameters.txt         |   4 +-
 .../media}/au0828-cardlist.rst                |   0
 .../media}/avermedia.rst                      |   0
 .../media}/bt8xx.rst                          |   8 +-
 .../media}/bttv-cardlist.rst                  |   0
 .../media}/bttv.rst                           |   0
 .../media}/cafe_ccic.rst                      |   0
 .../media}/cardlist.rst                       |   0
 .../media}/cards.rst                          |   0
 .../dvb-drivers => admin-guide/media}/ci.rst  |   0
 .../media}/cpia2.rst                          |   0
 .../media}/cx23885-cardlist.rst               |   0
 .../media}/cx88-cardlist.rst                  |   0
 .../media}/cx88.rst                           |   0
 .../media}/davinci-vpbe.rst                   |   0
 .../media}/em28xx-cardlist.rst                |   0
 .../dvb-drivers => admin-guide/media}/faq.rst |   0
 .../media}/fimc.rst                           |   0
 .../media}/gspca-cardlist.rst                 |   0
 .../v4l-drivers => admin-guide/media}/imx.rst |   0
 .../media}/imx7.rst                           |   0
 Documentation/admin-guide/media/index.rst     | 104 ++++++++++++++++++
 .../media}/intro.rst                          |   0
 .../media}/ipu3.rst                           |   0
 .../media}/ipu3_rcb.svg                       |   0
 .../media}/ivtv-cardlist.rst                  |   0
 .../media}/ivtv.rst                           |   0
 .../media}/lmedm04.rst                        |   0
 .../media}/meye.rst                           |   0
 .../media}/omap3isp.rst                       |   0
 .../media}/omap4_camera.rst                   |   0
 .../media}/opera-firmware.rst                 |   0
 .../media}/philips.rst                        |   0
 .../media}/pulse8-cec.rst                     |   0
 .../media}/qcom_camss.rst                     |   0
 .../media}/qcom_camss_8x96_graph.dot          |   0
 .../media}/qcom_camss_graph.dot               |   0
 .../media}/rcar-fdp1.rst                      |   0
 .../media}/saa7134-cardlist.rst               |   0
 .../media}/saa7134.rst                        |   0
 .../media}/saa7164-cardlist.rst               |   0
 .../media}/si470x.rst                         |   0
 .../media}/si4713.rst                         |   0
 .../media}/si476x.rst                         |   0
 .../media}/technisat.rst                      |   0
 .../media}/tm6000-cardlist.rst                |   0
 .../media}/ttusb-dec.rst                      |   0
 .../media}/tuner-cardlist.rst                 |   0
 .../media}/udev.rst                           |   0
 .../media}/usbvision-cardlist.rst             |   0
 .../media}/v4l-with-ir.rst                    |   0
 .../media}/vimc.dot                           |   0
 .../media}/vimc.rst                           |   0
 .../media}/vivid.rst                          |   0
 .../media}/zr364xx.rst                        |   0
 Documentation/media/cec-drivers/index.rst     |  34 ------
 Documentation/media/dvb-drivers/index.rst     |  11 --
 Documentation/media/index.rst                 |   4 +-
 Documentation/media/v4l-drivers/index.rst     |  25 -----
 .../zh_CN/video4linux/omap3isp.txt            |   4 +-
 .../media/v4l/dev-sliced-vbi.rst              |   2 +-
 .../media/v4l/ext-ctrls-codec.rst             |   2 +-
 .../media/v4l/ext-ctrls-image-process.rst     |   2 +-
 .../media/v4l/pixfmt-reserved.rst             |   2 +-
 MAINTAINERS                                   |  22 ++--
 drivers/media/pci/bt8xx/Kconfig               |   2 +-
 drivers/media/pci/meye/Kconfig                |   2 +-
 drivers/media/radio/si470x/Kconfig            |   2 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c        |   2 +-
 drivers/media/usb/gspca/Kconfig               |   2 +-
 drivers/media/usb/zr364xx/Kconfig             |   2 +-
 72 files changed, 136 insertions(+), 101 deletions(-)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/au0828-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/avermedia.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/bt8xx.rst (93%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/bttv.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cafe_ccic.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/cards.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/ci.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cpia2.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cx23885-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cx88-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/cx88.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/davinci-vpbe.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/em28xx-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/faq.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/fimc.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/gspca-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/imx.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/imx7.rst (100%)
 create mode 100644 Documentation/admin-guide/media/index.rst
 rename Documentation/{media/dvb-drivers => admin-guide/media}/intro.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ipu3_rcb.svg (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/ivtv.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/lmedm04.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/meye.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/omap3isp.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/omap4_camera.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/opera-firmware.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/philips.rst (100%)
 rename Documentation/{media/cec-drivers => admin-guide/media}/pulse8-cec.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_8x96_graph.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/qcom_camss_graph.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/rcar-fdp1.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7134-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7134.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/saa7164-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si470x.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si4713.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/si476x.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/technisat.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/tm6000-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/ttusb-dec.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/tuner-cardlist.rst (100%)
 rename Documentation/{media/dvb-drivers => admin-guide/media}/udev.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/usbvision-cardlist.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/v4l-with-ir.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.dot (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vimc.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/vivid.rst (100%)
 rename Documentation/{media/v4l-drivers => admin-guide/media}/zr364xx.rst (100%)
 delete mode 100644 Documentation/media/cec-drivers/index.rst

diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
index f1d0ccffbe72..29a1355d0bed 100644
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@ -92,6 +92,7 @@ configure specific aspects of kernel behavior to your liking.
    lockup-watchdogs
    LSM/index
    md
+   media/index
    mm/index
    module-signing
    mono
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index dbc22d684627..b12e9904a320 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -449,7 +449,7 @@
 	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)
 	bttv.radio=	Most important insmod options are available as
 			kernel args too.
-	bttv.pll=	See Documentation/media/v4l-drivers/bttv.rst
+	bttv.pll=	See Documentation/admin-guide/media/bttv.rst
 	bttv.tuner=
 
 	bulk_remove=off	[PPC]  This parameter disables the use of the pSeries
@@ -2658,7 +2658,7 @@
 			See Documentation/admin-guide/pm/sleep-states.rst.
 
 	meye.*=		[HW] Set MotionEye Camera parameters
-			See Documentation/media/v4l-drivers/meye.rst.
+			See Documentation/admin-guide/media/meye.rst.
 
 	mfgpt_irq=	[IA-32] Specify the IRQ to use for the
 			Multi-Function General Purpose Timers on AMD Geode
diff --git a/Documentation/media/v4l-drivers/au0828-cardlist.rst b/Documentation/admin-guide/media/au0828-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/au0828-cardlist.rst
rename to Documentation/admin-guide/media/au0828-cardlist.rst
diff --git a/Documentation/media/dvb-drivers/avermedia.rst b/Documentation/admin-guide/media/avermedia.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/avermedia.rst
rename to Documentation/admin-guide/media/avermedia.rst
diff --git a/Documentation/media/dvb-drivers/bt8xx.rst b/Documentation/admin-guide/media/bt8xx.rst
similarity index 93%
rename from Documentation/media/dvb-drivers/bt8xx.rst
rename to Documentation/admin-guide/media/bt8xx.rst
index 7936cd96fc8f..d800f7791ada 100644
--- a/Documentation/media/dvb-drivers/bt8xx.rst
+++ b/Documentation/admin-guide/media/bt8xx.rst
@@ -20,7 +20,7 @@ General information
 
 This class of cards has a bt878a as the PCI interface, and require the bttv driver
 for accessing the i2c bus and the gpio pins of the bt8xx chipset.
-Please see Documentation/media/dvb-drivers/cards.rst => o Cards based on the Conexant Bt8xx PCI bridge:
+Please see Documentation/admin-guide/media/cards.rst => o Cards based on the Conexant Bt8xx PCI bridge:
 
 Compiling kernel please enable:
 
@@ -47,7 +47,7 @@ Loading Modules
 Regular case: If the bttv driver detects a bt8xx-based DVB card, all frontend and backend modules will be loaded automatically.
 Exceptions are:
 - Old TwinHan DST cards or clones with or without CA slot and not containing an Eeprom.
-People running udev please see Documentation/media/dvb-drivers/udev.rst.
+People running udev please see Documentation/admin-guide/media/udev.rst.
 
 In the following cases overriding the PCI type detection for dvb-bt8xx might be necessary:
 
@@ -74,7 +74,7 @@ Useful parameters for verbosity level and debugging the dst module:
 The autodetected values are determined by the cards' "response string".
 In your logs see f. ex.: dst_get_device_id: Recognize [DSTMCI].
 For bug reports please send in a complete log with verbose=4 activated.
-Please also see Documentation/media/dvb-drivers/ci.rst.
+Please also see Documentation/admin-guide/media/ci.rst.
 
 Running multiple cards
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -102,7 +102,7 @@ Examples of card ID's:
 
 	$ modprobe bttv card=113 card=135
 
-For a full list of card ID's please see Documentation/media/v4l-drivers/bttv-cardlist.rst.
+For a full list of card ID's please see Documentation/admin-guide/media/bttv-cardlist.rst.
 In case of further problems please subscribe and send questions to the mailing list: linux-dvb@linuxtv.org.
 
 Probing the cards with broken PCI subsystem ID
diff --git a/Documentation/media/v4l-drivers/bttv-cardlist.rst b/Documentation/admin-guide/media/bttv-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/bttv-cardlist.rst
rename to Documentation/admin-guide/media/bttv-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/admin-guide/media/bttv.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/bttv.rst
rename to Documentation/admin-guide/media/bttv.rst
diff --git a/Documentation/media/v4l-drivers/cafe_ccic.rst b/Documentation/admin-guide/media/cafe_ccic.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cafe_ccic.rst
rename to Documentation/admin-guide/media/cafe_ccic.rst
diff --git a/Documentation/media/v4l-drivers/cardlist.rst b/Documentation/admin-guide/media/cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cardlist.rst
rename to Documentation/admin-guide/media/cardlist.rst
diff --git a/Documentation/media/dvb-drivers/cards.rst b/Documentation/admin-guide/media/cards.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/cards.rst
rename to Documentation/admin-guide/media/cards.rst
diff --git a/Documentation/media/dvb-drivers/ci.rst b/Documentation/admin-guide/media/ci.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/ci.rst
rename to Documentation/admin-guide/media/ci.rst
diff --git a/Documentation/media/v4l-drivers/cpia2.rst b/Documentation/admin-guide/media/cpia2.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cpia2.rst
rename to Documentation/admin-guide/media/cpia2.rst
diff --git a/Documentation/media/v4l-drivers/cx23885-cardlist.rst b/Documentation/admin-guide/media/cx23885-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cx23885-cardlist.rst
rename to Documentation/admin-guide/media/cx23885-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/cx88-cardlist.rst b/Documentation/admin-guide/media/cx88-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cx88-cardlist.rst
rename to Documentation/admin-guide/media/cx88-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/cx88.rst b/Documentation/admin-guide/media/cx88.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cx88.rst
rename to Documentation/admin-guide/media/cx88.rst
diff --git a/Documentation/media/v4l-drivers/davinci-vpbe.rst b/Documentation/admin-guide/media/davinci-vpbe.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/davinci-vpbe.rst
rename to Documentation/admin-guide/media/davinci-vpbe.rst
diff --git a/Documentation/media/v4l-drivers/em28xx-cardlist.rst b/Documentation/admin-guide/media/em28xx-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/em28xx-cardlist.rst
rename to Documentation/admin-guide/media/em28xx-cardlist.rst
diff --git a/Documentation/media/dvb-drivers/faq.rst b/Documentation/admin-guide/media/faq.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/faq.rst
rename to Documentation/admin-guide/media/faq.rst
diff --git a/Documentation/media/v4l-drivers/fimc.rst b/Documentation/admin-guide/media/fimc.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/fimc.rst
rename to Documentation/admin-guide/media/fimc.rst
diff --git a/Documentation/media/v4l-drivers/gspca-cardlist.rst b/Documentation/admin-guide/media/gspca-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/gspca-cardlist.rst
rename to Documentation/admin-guide/media/gspca-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/imx.rst b/Documentation/admin-guide/media/imx.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/imx.rst
rename to Documentation/admin-guide/media/imx.rst
diff --git a/Documentation/media/v4l-drivers/imx7.rst b/Documentation/admin-guide/media/imx7.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/imx7.rst
rename to Documentation/admin-guide/media/imx7.rst
diff --git a/Documentation/admin-guide/media/index.rst b/Documentation/admin-guide/media/index.rst
new file mode 100644
index 000000000000..5b355c327be1
--- /dev/null
+++ b/Documentation/admin-guide/media/index.rst
@@ -0,0 +1,104 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. include:: <isonum.txt>
+
+**Copyright** |copy| 1999-2020 : LinuxTV Developers
+
+This documentation is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+For more details see the file COPYING in the source distribution of Linux.
+
+.. _uapi-v4l-drivers:
+
+################################################
+Video4Linux (V4L)  driver-specific documentation
+################################################
+
+.. only:: html
+
+    .. class:: toc-title
+
+        Table of Contents
+
+.. toctree::
+	:maxdepth: 5
+	:numbered:
+
+	cardlist
+
+	v4l-with-ir
+
+	bttv
+	cafe_ccic
+	cpia2
+	cx88
+	davinci-vpbe
+	fimc
+	imx
+	imx7
+	ipu3
+	ivtv
+	meye
+	omap3isp
+	omap4_camera
+	philips
+	qcom_camss
+	rcar-fdp1
+	saa7134
+	si470x
+	si4713
+	si476x
+	vimc
+	vivid
+
+##############################################
+Linux Digital TV driver-specific documentation
+##############################################
+
+.. only:: html
+
+    .. class:: toc-title
+
+        Table of Contents
+
+.. toctree::
+	:maxdepth: 5
+	:numbered:
+
+	intro
+
+	cards
+	ci
+	faq
+
+	avermedia
+	bt8xx
+	lmedm04
+	opera-firmware
+	technisat
+	ttusb-dec
+	udev
+	zr364xx
+
+#################################
+CEC driver-specific documentation
+#################################
+
+.. only:: html
+
+    .. class:: toc-title
+
+        Table of Contents
+
+.. toctree::
+	:maxdepth: 5
+	:numbered:
+
+	pulse8-cec
diff --git a/Documentation/media/dvb-drivers/intro.rst b/Documentation/admin-guide/media/intro.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/intro.rst
rename to Documentation/admin-guide/media/intro.rst
diff --git a/Documentation/media/v4l-drivers/ipu3.rst b/Documentation/admin-guide/media/ipu3.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/ipu3.rst
rename to Documentation/admin-guide/media/ipu3.rst
diff --git a/Documentation/media/v4l-drivers/ipu3_rcb.svg b/Documentation/admin-guide/media/ipu3_rcb.svg
similarity index 100%
rename from Documentation/media/v4l-drivers/ipu3_rcb.svg
rename to Documentation/admin-guide/media/ipu3_rcb.svg
diff --git a/Documentation/media/v4l-drivers/ivtv-cardlist.rst b/Documentation/admin-guide/media/ivtv-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/ivtv-cardlist.rst
rename to Documentation/admin-guide/media/ivtv-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/ivtv.rst b/Documentation/admin-guide/media/ivtv.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/ivtv.rst
rename to Documentation/admin-guide/media/ivtv.rst
diff --git a/Documentation/media/dvb-drivers/lmedm04.rst b/Documentation/admin-guide/media/lmedm04.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/lmedm04.rst
rename to Documentation/admin-guide/media/lmedm04.rst
diff --git a/Documentation/media/v4l-drivers/meye.rst b/Documentation/admin-guide/media/meye.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/meye.rst
rename to Documentation/admin-guide/media/meye.rst
diff --git a/Documentation/media/v4l-drivers/omap3isp.rst b/Documentation/admin-guide/media/omap3isp.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/omap3isp.rst
rename to Documentation/admin-guide/media/omap3isp.rst
diff --git a/Documentation/media/v4l-drivers/omap4_camera.rst b/Documentation/admin-guide/media/omap4_camera.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/omap4_camera.rst
rename to Documentation/admin-guide/media/omap4_camera.rst
diff --git a/Documentation/media/dvb-drivers/opera-firmware.rst b/Documentation/admin-guide/media/opera-firmware.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/opera-firmware.rst
rename to Documentation/admin-guide/media/opera-firmware.rst
diff --git a/Documentation/media/v4l-drivers/philips.rst b/Documentation/admin-guide/media/philips.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/philips.rst
rename to Documentation/admin-guide/media/philips.rst
diff --git a/Documentation/media/cec-drivers/pulse8-cec.rst b/Documentation/admin-guide/media/pulse8-cec.rst
similarity index 100%
rename from Documentation/media/cec-drivers/pulse8-cec.rst
rename to Documentation/admin-guide/media/pulse8-cec.rst
diff --git a/Documentation/media/v4l-drivers/qcom_camss.rst b/Documentation/admin-guide/media/qcom_camss.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/qcom_camss.rst
rename to Documentation/admin-guide/media/qcom_camss.rst
diff --git a/Documentation/media/v4l-drivers/qcom_camss_8x96_graph.dot b/Documentation/admin-guide/media/qcom_camss_8x96_graph.dot
similarity index 100%
rename from Documentation/media/v4l-drivers/qcom_camss_8x96_graph.dot
rename to Documentation/admin-guide/media/qcom_camss_8x96_graph.dot
diff --git a/Documentation/media/v4l-drivers/qcom_camss_graph.dot b/Documentation/admin-guide/media/qcom_camss_graph.dot
similarity index 100%
rename from Documentation/media/v4l-drivers/qcom_camss_graph.dot
rename to Documentation/admin-guide/media/qcom_camss_graph.dot
diff --git a/Documentation/media/v4l-drivers/rcar-fdp1.rst b/Documentation/admin-guide/media/rcar-fdp1.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/rcar-fdp1.rst
rename to Documentation/admin-guide/media/rcar-fdp1.rst
diff --git a/Documentation/media/v4l-drivers/saa7134-cardlist.rst b/Documentation/admin-guide/media/saa7134-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/saa7134-cardlist.rst
rename to Documentation/admin-guide/media/saa7134-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/saa7134.rst b/Documentation/admin-guide/media/saa7134.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/saa7134.rst
rename to Documentation/admin-guide/media/saa7134.rst
diff --git a/Documentation/media/v4l-drivers/saa7164-cardlist.rst b/Documentation/admin-guide/media/saa7164-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/saa7164-cardlist.rst
rename to Documentation/admin-guide/media/saa7164-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/si470x.rst b/Documentation/admin-guide/media/si470x.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/si470x.rst
rename to Documentation/admin-guide/media/si470x.rst
diff --git a/Documentation/media/v4l-drivers/si4713.rst b/Documentation/admin-guide/media/si4713.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/si4713.rst
rename to Documentation/admin-guide/media/si4713.rst
diff --git a/Documentation/media/v4l-drivers/si476x.rst b/Documentation/admin-guide/media/si476x.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/si476x.rst
rename to Documentation/admin-guide/media/si476x.rst
diff --git a/Documentation/media/dvb-drivers/technisat.rst b/Documentation/admin-guide/media/technisat.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/technisat.rst
rename to Documentation/admin-guide/media/technisat.rst
diff --git a/Documentation/media/v4l-drivers/tm6000-cardlist.rst b/Documentation/admin-guide/media/tm6000-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/tm6000-cardlist.rst
rename to Documentation/admin-guide/media/tm6000-cardlist.rst
diff --git a/Documentation/media/dvb-drivers/ttusb-dec.rst b/Documentation/admin-guide/media/ttusb-dec.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/ttusb-dec.rst
rename to Documentation/admin-guide/media/ttusb-dec.rst
diff --git a/Documentation/media/v4l-drivers/tuner-cardlist.rst b/Documentation/admin-guide/media/tuner-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/tuner-cardlist.rst
rename to Documentation/admin-guide/media/tuner-cardlist.rst
diff --git a/Documentation/media/dvb-drivers/udev.rst b/Documentation/admin-guide/media/udev.rst
similarity index 100%
rename from Documentation/media/dvb-drivers/udev.rst
rename to Documentation/admin-guide/media/udev.rst
diff --git a/Documentation/media/v4l-drivers/usbvision-cardlist.rst b/Documentation/admin-guide/media/usbvision-cardlist.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/usbvision-cardlist.rst
rename to Documentation/admin-guide/media/usbvision-cardlist.rst
diff --git a/Documentation/media/v4l-drivers/v4l-with-ir.rst b/Documentation/admin-guide/media/v4l-with-ir.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/v4l-with-ir.rst
rename to Documentation/admin-guide/media/v4l-with-ir.rst
diff --git a/Documentation/media/v4l-drivers/vimc.dot b/Documentation/admin-guide/media/vimc.dot
similarity index 100%
rename from Documentation/media/v4l-drivers/vimc.dot
rename to Documentation/admin-guide/media/vimc.dot
diff --git a/Documentation/media/v4l-drivers/vimc.rst b/Documentation/admin-guide/media/vimc.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/vimc.rst
rename to Documentation/admin-guide/media/vimc.rst
diff --git a/Documentation/media/v4l-drivers/vivid.rst b/Documentation/admin-guide/media/vivid.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/vivid.rst
rename to Documentation/admin-guide/media/vivid.rst
diff --git a/Documentation/media/v4l-drivers/zr364xx.rst b/Documentation/admin-guide/media/zr364xx.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/zr364xx.rst
rename to Documentation/admin-guide/media/zr364xx.rst
diff --git a/Documentation/media/cec-drivers/index.rst b/Documentation/media/cec-drivers/index.rst
deleted file mode 100644
index 2b7fcaa4311b..000000000000
--- a/Documentation/media/cec-drivers/index.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-.. include:: <isonum.txt>
-
-.. _cec-drivers:
-
-#################################
-CEC driver-specific documentation
-#################################
-
-**Copyright** |copy| 2017 : LinuxTV Developers
-
-This documentation is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-
-For more details see the file COPYING in the source distribution of Linux.
-
-.. only:: html
-
-    .. class:: toc-title
-
-        Table of Contents
-
-.. toctree::
-	:maxdepth: 5
-	:numbered:
-
-	pulse8-cec
diff --git a/Documentation/media/dvb-drivers/index.rst b/Documentation/media/dvb-drivers/index.rst
index 9d3fce544f85..7a870ee7ac7d 100644
--- a/Documentation/media/dvb-drivers/index.rst
+++ b/Documentation/media/dvb-drivers/index.rst
@@ -29,17 +29,6 @@ For more details see the file COPYING in the source distribution of Linux.
 	:maxdepth: 5
 	:numbered:
 
-	intro
-	avermedia
-	bt8xx
-	cards
-	ci
 	dvb-usb
-	faq
-	lmedm04
-	opera-firmware
-	technisat
-	ttusb-dec
-	udev
 	frontends
 	contributors
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
index 308f6a396d1c..0f75280b8c43 100644
--- a/Documentation/media/index.rst
+++ b/Documentation/media/index.rst
@@ -14,9 +14,9 @@ Linux Media Subsystem Documentation
 
    ../userspace-api/media/index
    ../driver-api/media/index
-   dvb-drivers/index
+
    v4l-drivers/index
-   cec-drivers/index
+   dvb-drivers/index
 
 .. only:: html and subproject
 
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index 8962a86dad70..aef375cfb05a 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -31,38 +31,13 @@ For more details see the file COPYING in the source distribution of Linux.
 	:maxdepth: 5
 	:numbered:
 
-	v4l-with-ir
 	tuners
-	cardlist
-	bttv
-	cafe_ccic
-	cpia2
-	cx88
-	davinci-vpbe
-	fimc
-	imx
-	imx7
-	ipu3
-	ivtv
 	max2175
-	meye
-	omap3isp
-	omap4_camera
-	philips
 	pvrusb2
 	pxa_camera
-	qcom_camss
 	radiotrack
-	rcar-fdp1
-	saa7134
 	sh_mobile_ceu_camera
-	si470x
-	si4713
-	si476x
 	uvcvideo
-	vimc
-	vivid
-	zr364xx
 
 	bttv-devel
 	cpia2_devel
diff --git a/Documentation/translations/zh_CN/video4linux/omap3isp.txt b/Documentation/translations/zh_CN/video4linux/omap3isp.txt
index e9f29375aa95..75e481985630 100644
--- a/Documentation/translations/zh_CN/video4linux/omap3isp.txt
+++ b/Documentation/translations/zh_CN/video4linux/omap3isp.txt
@@ -1,4 +1,4 @@
-Chinese translated version of Documentation/media/v4l-drivers/omap3isp.rst
+Chinese translated version of Documentation/admin-guide/media/omap3isp.rst
 
 If you have any comment or update to the content, please contact the
 original document maintainer directly.  However, if you have a problem
@@ -11,7 +11,7 @@ Maintainer: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 	  David Cohen <dacohen@gmail.com>
 Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>
 ---------------------------------------------------------------------
-Documentation/media/v4l-drivers/omap3isp.rst 的中文翻译
+Documentation/admin-guide/media/omap3isp.rst 的中文翻译
 
 如果想评论或更新本文的内容,请直接联系原文档的维护者。如果你使用英文
 交流有困难的话,也可以向中文版维护者求助。如果本翻译更新不及时或者翻
diff --git a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
index 0767299e9105..751c6590e774 100644
--- a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
+++ b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
@@ -438,7 +438,7 @@ MPEG stream.
 *Historical context*: This format specification originates from a
 custom, embedded, sliced VBI data format used by the ``ivtv`` driver.
 This format has already been informally specified in the kernel sources
-in the file ``Documentation/media/v4l-drivers/cx2341x.rst`` . The
+in the file ``Documentation/media/v4l-drivers/cx2341x-uapi.rst`` . The
 maximum size of the payload and other aspects of this format are driven
 by the CX23415 MPEG decoder's capabilities and limitations with respect
 to extracting, decoding, and displaying sliced VBI data embedded within
diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
index f64f6fc4fd75..f81016c97a0d 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
@@ -116,7 +116,7 @@ enum v4l2_mpeg_stream_vbi_fmt -
     * - ``V4L2_MPEG_STREAM_VBI_FMT_IVTV``
       - VBI in private packets, IVTV format (documented in the kernel
 	sources in the file
-	``Documentation/media/v4l-drivers/cx2341x.rst``)
+	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``)
 
 
 
diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst
index e47103aa32ed..bb9d484c25e4 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst
@@ -53,7 +53,7 @@ Image Process Control IDs
 
 ``V4L2_CID_DEINTERLACING_MODE (menu)``
     The video deinterlacing mode (such as Bob, Weave, ...). The menu items are
-    driver specific and are documented in :ref:`v4l-drivers`.
+    driver specific and are documented in :ref:`uapi-v4l-drivers`.
 
 ``V4L2_CID_DIGITAL_GAIN (integer)``
     Digital gain is the value by which all colour components
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
index 8ef90b0df864..dbdcf6c9f072 100644
--- a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
+++ b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
@@ -58,7 +58,7 @@ please make a proposal on the linux-media mailing list.
       - YUV 4:2:0 format used by the IVTV driver.
 
 	The format is documented in the kernel sources in the file
-	``Documentation/media/v4l-drivers/cx2341x.rst``
+	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``
     * .. _V4L2-PIX-FMT-CPIA1:
 
       - ``V4L2_PIX_FMT_CPIA1``
diff --git a/MAINTAINERS b/MAINTAINERS
index b5af1feb5ba1..fbb8b1f13cb8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3711,7 +3711,7 @@ M:	Jonathan Corbet <corbet@lwn.net>
 L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
-F:	Documentation/media/v4l-drivers/cafe_ccic*
+F:	Documentation/admin-guide/media/cafe_ccic*
 F:	drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
@@ -6180,7 +6180,7 @@ W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	drivers/media/usb/em28xx/
-F:	Documentation/media/v4l-drivers/em28xx*
+F:	Documentation/admin-guide/media/em28xx*
 
 EMBEDDED LINUX
 M:	Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -8529,8 +8529,8 @@ L:	linux-media@vger.kernel.org
 S:	Maintained
 F:	drivers/staging/media/ipu3/
 F:	Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
-F:	Documentation/media/v4l-drivers/ipu3.rst
-F:	Documentation/media/v4l-drivers/ipu3_rcb.svg
+F:	Documentation/admin-guide/media/ipu3.rst
+F:	Documentation/admin-guide/media/ipu3_rcb.svg
 
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:	Krzysztof Halasa <khalasa@piap.pl>
@@ -8953,7 +8953,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 W:	https://linuxtv.org
 S:	Maintained
-F:	Documentation/media/v4l-drivers/ivtv*
+F:	Documentation/admin-guide/media/ivtv*
 F:	drivers/media/pci/ivtv/
 F:	include/uapi/linux/ivtv*
 
@@ -10322,7 +10322,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/imx.txt
-F:	Documentation/media/v4l-drivers/imx.rst
+F:	Documentation/admin-guide/media/imx.rst
 F:	drivers/staging/media/imx/
 F:	include/linux/imx-media.h
 F:	include/media/imx.h
@@ -10341,7 +10341,7 @@ T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/imx7-csi.txt
 F:	Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
-F:	Documentation/media/v4l-drivers/imx7.rst
+F:	Documentation/admin-guide/media/imx7.rst
 F:	drivers/staging/media/imx/imx7-media-csi.c
 F:	drivers/staging/media/imx/imx7-mipi-csis.c
 
@@ -13570,7 +13570,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	drivers/media/usb/pulse8-cec/*
-F:	Documentation/media/cec-drivers/pulse8-cec.rst
+F:	Documentation/admin-guide/media/pulse8-cec.rst
 
 PVRUSB2 VIDEO4LINUX DRIVER
 M:	Mike Isely <isely@pobox.com>
@@ -13820,7 +13820,7 @@ M:	Todor Tomov <todor.too@gmail.com>
 L:	linux-media@vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/qcom,camss.txt
-F:	Documentation/media/v4l-drivers/qcom_camss.rst
+F:	Documentation/admin-guide/media/qcom_camss.rst
 F:	drivers/media/platform/qcom/camss/
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
@@ -16828,7 +16828,7 @@ W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Odd fixes
 F:	drivers/media/usb/tm6000/
-F:	Documentation/media/v4l-drivers/tm6000*
+F:	Documentation/admin-guide/media/tm6000*
 
 TMIO/SDHI MMC DRIVER
 M:	Wolfram Sang <wsa+renesas@sang-engineering.com>
@@ -17502,7 +17502,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 W:	http://royale.zerezo.com/zr364xx/
 S:	Maintained
-F:	Documentation/media/v4l-drivers/zr364xx*
+F:	Documentation/admin-guide/media/zr364xx*
 F:	drivers/media/usb/zr364xx/
 
 USER-MODE LINUX (UML)
diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig
index 75d172a6f54c..3f56decbb681 100644
--- a/drivers/media/pci/bt8xx/Kconfig
+++ b/drivers/media/pci/bt8xx/Kconfig
@@ -17,7 +17,7 @@ config VIDEO_BT848
 	help
 	  Support for BT848 based frame grabber/overlay boards. This includes
 	  the Miro, Hauppauge and STB boards. Please read the material in
-	  <file:Documentation/media/v4l-drivers/bttv.rst> for more information.
+	  <file:Documentation/admin-guide/media/bttv.rst> for more information.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called bttv.
diff --git a/drivers/media/pci/meye/Kconfig b/drivers/media/pci/meye/Kconfig
index b37da612dd0c..fed1f4a01817 100644
--- a/drivers/media/pci/meye/Kconfig
+++ b/drivers/media/pci/meye/Kconfig
@@ -7,7 +7,7 @@ config VIDEO_MEYE
 	help
 	  This is the video4linux driver for the Motion Eye camera found
 	  in the Vaio Picturebook laptops. Please read the material in
-	  <file:Documentation/media/v4l-drivers/meye.rst> for more information.
+	  <file:Documentation/admin-guide/media/meye.rst> for more information.
 
 	  If you say Y or M here, you need to say Y or M to "Sony Laptop
 	  Extras" in the misc device section.
diff --git a/drivers/media/radio/si470x/Kconfig b/drivers/media/radio/si470x/Kconfig
index a1ba8bc54b62..7161bd6cd13c 100644
--- a/drivers/media/radio/si470x/Kconfig
+++ b/drivers/media/radio/si470x/Kconfig
@@ -30,7 +30,7 @@ config USB_SI470X
 
 	  Please have a look at the documentation, especially on how
 	  to redirect the audio stream from the radio to your sound device:
-	  Documentation/media/v4l-drivers/si470x.rst
+	  Documentation/admin-guide/media/si470x.rst
 
 	  Say Y here if you want to connect this type of radio to your
 	  computer's USB port.
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 62d3566bf7ee..4cf09c5c8216 100644
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -22,7 +22,7 @@
  *
  * LME2510C + M88RS2000
  *
- * For firmware see Documentation/media/dvb-drivers/lmedm04.rst
+ * For firmware see Documentation/admin-guide/media/lmedm04.rst
  *
  * I2C addresses:
  * 0xd0 - STV0288	- Demodulator
diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig
index 77a360958239..0283e3b908e4 100644
--- a/drivers/media/usb/gspca/Kconfig
+++ b/drivers/media/usb/gspca/Kconfig
@@ -9,7 +9,7 @@ menuconfig USB_GSPCA
 	  Say Y here if you want to enable selecting webcams based
 	  on the GSPCA framework.
 
-	  See <file:Documentation/media/v4l-drivers/gspca-cardlist.rst> for more info.
+	  See <file:Documentation/admin-guide/media/gspca-cardlist.rst> for more info.
 
 	  This driver uses the Video For Linux API. You must say Y or M to
 	  "Video For Linux" to use this driver.
diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/media/usb/zr364xx/Kconfig
index 55b06c833667..49b4257487bb 100644
--- a/drivers/media/usb/zr364xx/Kconfig
+++ b/drivers/media/usb/zr364xx/Kconfig
@@ -7,7 +7,7 @@ config USB_ZR364XX
 	help
 	  Say Y here if you want to connect this type of camera to your
 	  computer's USB port.
-	  See <file:Documentation/media/v4l-drivers/zr364xx.rst> for more info
+	  See <file:Documentation/admin-guide/media/zr364xx.rst> for more info
 	  and list of supported cameras.
 
 	  To compile this driver as a module, choose M here: the
-- 
2.24.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff
  2020-03-10 13:42 [PATCH v2 00/22] Move media documentation files Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 15/22] media: docs: split uAPI info from imx.rst Mauro Carvalho Chehab
  2020-03-10 13:43 ` [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide Mauro Carvalho Chehab
@ 2020-03-10 13:43 ` Mauro Carvalho Chehab
  2020-03-12  7:31   ` Hans Verkuil
  2 siblings, 1 reply; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2020-03-10 13:43 UTC (permalink / raw)
  To: Linux Doc Mailing List
  Cc: Jonathan Corbet, Mauro Carvalho Chehab, Fabio Estevam,
	Sascha Hauer, linux-kernel, Ramesh Shanmugasundaram,
	NXP Linux Team, Pengutronix Kernel Team, Shawn Guo,
	linux-arm-kernel, linux-media

There are some uAPI stuff that are driver-specific. Add them
to the main media uAPI body.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 Documentation/media/index.rst                              | 2 --
 .../media/drivers}/cx2341x-uapi.rst                        | 0
 .../media/drivers}/imx-uapi.rst                            | 0
 .../v4l-drivers => userspace-api/media/drivers}/index.rst  | 7 +++----
 .../media/drivers}/max2175.rst                             | 0
 .../media/drivers}/meye-uapi.rst                           | 0
 .../media/drivers}/omap3isp-uapi.rst                       | 0
 .../media/drivers}/uvcvideo.rst                            | 0
 Documentation/userspace-api/media/index.rst                | 2 ++
 Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst   | 2 +-
 Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst  | 2 +-
 Documentation/userspace-api/media/v4l/pixfmt-reserved.rst  | 2 +-
 MAINTAINERS                                                | 4 ++--
 drivers/media/i2c/max2175.c                                | 6 +++---
 14 files changed, 13 insertions(+), 14 deletions(-)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/cx2341x-uapi.rst (100%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/imx-uapi.rst (100%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/index.rst (97%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/max2175.rst (100%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/meye-uapi.rst (100%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/omap3isp-uapi.rst (100%)
 rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/uvcvideo.rst (100%)

diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
index a5cd600e0b04..e93fd88881af 100644
--- a/Documentation/media/index.rst
+++ b/Documentation/media/index.rst
@@ -15,8 +15,6 @@ Linux Media Subsystem Documentation
    ../userspace-api/media/index
    ../driver-api/media/index
 
-   v4l-drivers/index
-
 .. only:: html and subproject
 
    Indices
diff --git a/Documentation/media/v4l-drivers/cx2341x-uapi.rst b/Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/cx2341x-uapi.rst
rename to Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
diff --git a/Documentation/media/v4l-drivers/imx-uapi.rst b/Documentation/userspace-api/media/drivers/imx-uapi.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/imx-uapi.rst
rename to Documentation/userspace-api/media/drivers/imx-uapi.rst
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst
similarity index 97%
rename from Documentation/media/v4l-drivers/index.rst
rename to Documentation/userspace-api/media/drivers/index.rst
index ee7faff88a33..05a82f8c0c99 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/userspace-api/media/drivers/index.rst
@@ -2,7 +2,7 @@
 
 .. include:: <isonum.txt>
 
-.. _v4l-drivers:
+.. _v4l-drivers_uapi:
 
 ################################################
 Video4Linux (V4L)  driver-specific documentation
@@ -31,10 +31,9 @@ For more details see the file COPYING in the source distribution of Linux.
 	:maxdepth: 5
 	:numbered:
 
-	max2175
-	uvcvideo
-
 	cx2341x-uapi
 	imx-uapi
+	max2175
 	meye-uapi
 	omap3isp-uapi
+	uvcvideo
diff --git a/Documentation/media/v4l-drivers/max2175.rst b/Documentation/userspace-api/media/drivers/max2175.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/max2175.rst
rename to Documentation/userspace-api/media/drivers/max2175.rst
diff --git a/Documentation/media/v4l-drivers/meye-uapi.rst b/Documentation/userspace-api/media/drivers/meye-uapi.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/meye-uapi.rst
rename to Documentation/userspace-api/media/drivers/meye-uapi.rst
diff --git a/Documentation/media/v4l-drivers/omap3isp-uapi.rst b/Documentation/userspace-api/media/drivers/omap3isp-uapi.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/omap3isp-uapi.rst
rename to Documentation/userspace-api/media/drivers/omap3isp-uapi.rst
diff --git a/Documentation/media/v4l-drivers/uvcvideo.rst b/Documentation/userspace-api/media/drivers/uvcvideo.rst
similarity index 100%
rename from Documentation/media/v4l-drivers/uvcvideo.rst
rename to Documentation/userspace-api/media/drivers/uvcvideo.rst
diff --git a/Documentation/userspace-api/media/index.rst b/Documentation/userspace-api/media/index.rst
index 614310f82395..bcfdd1a5caa0 100644
--- a/Documentation/userspace-api/media/index.rst
+++ b/Documentation/userspace-api/media/index.rst
@@ -31,3 +31,5 @@ entitled "GNU Free Documentation License".
     cec/cec-api
     gen-errors
     fdl-appendix
+
+    drivers/index
diff --git a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
index 751c6590e774..dd0b6646beb5 100644
--- a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
+++ b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
@@ -438,7 +438,7 @@ MPEG stream.
 *Historical context*: This format specification originates from a
 custom, embedded, sliced VBI data format used by the ``ivtv`` driver.
 This format has already been informally specified in the kernel sources
-in the file ``Documentation/media/v4l-drivers/cx2341x-uapi.rst`` . The
+in the file ``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst`` . The
 maximum size of the payload and other aspects of this format are driven
 by the CX23415 MPEG decoder's capabilities and limitations with respect
 to extracting, decoding, and displaying sliced VBI data embedded within
diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
index f81016c97a0d..9b48338fb783 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
@@ -116,7 +116,7 @@ enum v4l2_mpeg_stream_vbi_fmt -
     * - ``V4L2_MPEG_STREAM_VBI_FMT_IVTV``
       - VBI in private packets, IVTV format (documented in the kernel
 	sources in the file
-	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``)
+	``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst``)
 
 
 
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
index dbdcf6c9f072..59b9e7238f90 100644
--- a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
+++ b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
@@ -58,7 +58,7 @@ please make a proposal on the linux-media mailing list.
       - YUV 4:2:0 format used by the IVTV driver.
 
 	The format is documented in the kernel sources in the file
-	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``
+	``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst``
     * .. _V4L2-PIX-FMT-CPIA1:
 
       - ``V4L2_PIX_FMT_CPIA1``
diff --git a/MAINTAINERS b/MAINTAINERS
index cf4fd454e053..a883c2e53b86 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10135,7 +10135,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/i2c/max2175.txt
-F:	Documentation/media/v4l-drivers/max2175.rst
+F:	Documentation/userspace-api/media/drivers/max2175.rst
 F:	drivers/media/i2c/max2175*
 F:	include/uapi/linux/max2175.h
 
@@ -11251,7 +11251,7 @@ F:	kernel/module.c
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 W:	http://popies.net/meye/
 S:	Orphan
-F:	Documentation/media/v4l-drivers/meye*
+F:	Documentation/userspace-api/media/drivers/meye*
 F:	drivers/media/pci/meye/
 F:	include/uapi/linux/meye.h
 
diff --git a/drivers/media/i2c/max2175.c b/drivers/media/i2c/max2175.c
index 506a30e69ced..03b4ed3a61b8 100644
--- a/drivers/media/i2c/max2175.c
+++ b/drivers/media/i2c/max2175.c
@@ -1194,7 +1194,7 @@ static const struct v4l2_ctrl_ops max2175_ctrl_ops = {
 
 /*
  * I2S output enable/disable configuration. This is a private control.
- * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
+ * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
  */
 static const struct v4l2_ctrl_config max2175_i2s_en = {
 	.ops = &max2175_ctrl_ops,
@@ -1210,7 +1210,7 @@ static const struct v4l2_ctrl_config max2175_i2s_en = {
 
 /*
  * HSLS value control LO freq adjacent location configuration.
- * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
+ * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
  */
 static const struct v4l2_ctrl_config max2175_hsls = {
 	.ops = &max2175_ctrl_ops,
@@ -1226,7 +1226,7 @@ static const struct v4l2_ctrl_config max2175_hsls = {
 /*
  * Rx modes below are a set of preset configurations that decides the tuner's
  * sck and sample rate of transmission. They are separate for EU & NA regions.
- * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
+ * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
  */
 static const char * const max2175_ctrl_eu_rx_modes[] = {
 	[MAX2175_EU_FM_1_2]	= "EU FM 1.2",
-- 
2.24.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide
  2020-03-10 13:43 ` [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide Mauro Carvalho Chehab
@ 2020-03-12  7:25   ` Hans Verkuil
  0 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2020-03-12  7:25 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Linux Doc Mailing List
  Cc: Malcolm Priestley, Andy Walls, Pengutronix Kernel Team,
	Jonathan Corbet, Alex Shi, Fabio Estevam, Sascha Hauer, linux-usb,
	linux-kernel, Todor Tomov, Sakari Ailus, Rui Miguel Silva,
	Harry Wei, NXP Linux Team, Philipp Zabel, Steve Longerbeam,
	Antoine Jacquet, Shawn Guo, linux-arm-kernel, linux-media

On 3/10/20 2:43 PM, Mauro Carvalho Chehab wrote:
> Most of the driver-specific documentation is meant to help
> users of the media subsystem.
> 
> Move them to the admin-guide.
> 
> It should be noticed, however, that several of those files
> are outdated and will require further work in order to make
> them useful again.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  Documentation/admin-guide/index.rst           |   1 +
>  .../admin-guide/kernel-parameters.txt         |   4 +-
>  .../media}/au0828-cardlist.rst                |   0
>  .../media}/avermedia.rst                      |   0
>  .../media}/bt8xx.rst                          |   8 +-
>  .../media}/bttv-cardlist.rst                  |   0
>  .../media}/bttv.rst                           |   0
>  .../media}/cafe_ccic.rst                      |   0
>  .../media}/cardlist.rst                       |   0
>  .../media}/cards.rst                          |   0
>  .../dvb-drivers => admin-guide/media}/ci.rst  |   0
>  .../media}/cpia2.rst                          |   0
>  .../media}/cx23885-cardlist.rst               |   0
>  .../media}/cx88-cardlist.rst                  |   0
>  .../media}/cx88.rst                           |   0
>  .../media}/davinci-vpbe.rst                   |   0
>  .../media}/em28xx-cardlist.rst                |   0
>  .../dvb-drivers => admin-guide/media}/faq.rst |   0
>  .../media}/fimc.rst                           |   0
>  .../media}/gspca-cardlist.rst                 |   0
>  .../v4l-drivers => admin-guide/media}/imx.rst |   0
>  .../media}/imx7.rst                           |   0
>  Documentation/admin-guide/media/index.rst     | 104 ++++++++++++++++++
>  .../media}/intro.rst                          |   0
>  .../media}/ipu3.rst                           |   0
>  .../media}/ipu3_rcb.svg                       |   0
>  .../media}/ivtv-cardlist.rst                  |   0
>  .../media}/ivtv.rst                           |   0
>  .../media}/lmedm04.rst                        |   0
>  .../media}/meye.rst                           |   0
>  .../media}/omap3isp.rst                       |   0
>  .../media}/omap4_camera.rst                   |   0
>  .../media}/opera-firmware.rst                 |   0
>  .../media}/philips.rst                        |   0
>  .../media}/pulse8-cec.rst                     |   0
>  .../media}/qcom_camss.rst                     |   0
>  .../media}/qcom_camss_8x96_graph.dot          |   0
>  .../media}/qcom_camss_graph.dot               |   0
>  .../media}/rcar-fdp1.rst                      |   0
>  .../media}/saa7134-cardlist.rst               |   0
>  .../media}/saa7134.rst                        |   0
>  .../media}/saa7164-cardlist.rst               |   0
>  .../media}/si470x.rst                         |   0
>  .../media}/si4713.rst                         |   0
>  .../media}/si476x.rst                         |   0
>  .../media}/technisat.rst                      |   0
>  .../media}/tm6000-cardlist.rst                |   0
>  .../media}/ttusb-dec.rst                      |   0
>  .../media}/tuner-cardlist.rst                 |   0
>  .../media}/udev.rst                           |   0
>  .../media}/usbvision-cardlist.rst             |   0
>  .../media}/v4l-with-ir.rst                    |   0
>  .../media}/vimc.dot                           |   0
>  .../media}/vimc.rst                           |   0
>  .../media}/vivid.rst                          |   0
>  .../media}/zr364xx.rst                        |   0
>  Documentation/media/cec-drivers/index.rst     |  34 ------
>  Documentation/media/dvb-drivers/index.rst     |  11 --
>  Documentation/media/index.rst                 |   4 +-
>  Documentation/media/v4l-drivers/index.rst     |  25 -----
>  .../zh_CN/video4linux/omap3isp.txt            |   4 +-
>  .../media/v4l/dev-sliced-vbi.rst              |   2 +-
>  .../media/v4l/ext-ctrls-codec.rst             |   2 +-
>  .../media/v4l/ext-ctrls-image-process.rst     |   2 +-
>  .../media/v4l/pixfmt-reserved.rst             |   2 +-
>  MAINTAINERS                                   |  22 ++--
>  drivers/media/pci/bt8xx/Kconfig               |   2 +-
>  drivers/media/pci/meye/Kconfig                |   2 +-
>  drivers/media/radio/si470x/Kconfig            |   2 +-
>  drivers/media/usb/dvb-usb-v2/lmedm04.c        |   2 +-
>  drivers/media/usb/gspca/Kconfig               |   2 +-
>  drivers/media/usb/zr364xx/Kconfig             |   2 +-
>  72 files changed, 136 insertions(+), 101 deletions(-)
>  rename Documentation/{media/v4l-drivers => admin-guide/media}/au0828-cardlist.rst (100%)
>  rename Documentation/{media/dvb-drivers => admin-guide/media}/avermedia.rst (100%)
>  rename Documentation/{media/dvb-drivers => admin-guide/media}/bt8xx.rst (93%)

I would personally prefer to keep the split between v4l and dvb drivers, rather
then putting them all in the same directory.

What was the reason behind this choice?

Regards,

	Hans

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff
  2020-03-10 13:43 ` [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff Mauro Carvalho Chehab
@ 2020-03-12  7:31   ` Hans Verkuil
  0 siblings, 0 replies; 6+ messages in thread
From: Hans Verkuil @ 2020-03-12  7:31 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Linux Doc Mailing List
  Cc: Jonathan Corbet, Fabio Estevam, Sascha Hauer, linux-kernel,
	Ramesh Shanmugasundaram, NXP Linux Team, Pengutronix Kernel Team,
	Shawn Guo, linux-arm-kernel, linux-media

On 3/10/20 2:43 PM, Mauro Carvalho Chehab wrote:
> There are some uAPI stuff that are driver-specific. Add them
> to the main media uAPI body.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
>  Documentation/media/index.rst                              | 2 --
>  .../media/drivers}/cx2341x-uapi.rst                        | 0
>  .../media/drivers}/imx-uapi.rst                            | 0
>  .../v4l-drivers => userspace-api/media/drivers}/index.rst  | 7 +++----
>  .../media/drivers}/max2175.rst                             | 0
>  .../media/drivers}/meye-uapi.rst                           | 0
>  .../media/drivers}/omap3isp-uapi.rst                       | 0
>  .../media/drivers}/uvcvideo.rst                            | 0
>  Documentation/userspace-api/media/index.rst                | 2 ++
>  Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst   | 2 +-
>  Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst  | 2 +-
>  Documentation/userspace-api/media/v4l/pixfmt-reserved.rst  | 2 +-
>  MAINTAINERS                                                | 4 ++--
>  drivers/media/i2c/max2175.c                                | 6 +++---
>  14 files changed, 13 insertions(+), 14 deletions(-)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/cx2341x-uapi.rst (100%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/imx-uapi.rst (100%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/index.rst (97%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/max2175.rst (100%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/meye-uapi.rst (100%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/omap3isp-uapi.rst (100%)
>  rename Documentation/{media/v4l-drivers => userspace-api/media/drivers}/uvcvideo.rst (100%)
> 
> diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
> index a5cd600e0b04..e93fd88881af 100644
> --- a/Documentation/media/index.rst
> +++ b/Documentation/media/index.rst
> @@ -15,8 +15,6 @@ Linux Media Subsystem Documentation
>     ../userspace-api/media/index
>     ../driver-api/media/index
>  
> -   v4l-drivers/index
> -
>  .. only:: html and subproject
>  
>     Indices
> diff --git a/Documentation/media/v4l-drivers/cx2341x-uapi.rst b/Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/cx2341x-uapi.rst
> rename to Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
> diff --git a/Documentation/media/v4l-drivers/imx-uapi.rst b/Documentation/userspace-api/media/drivers/imx-uapi.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/imx-uapi.rst
> rename to Documentation/userspace-api/media/drivers/imx-uapi.rst
> diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst
> similarity index 97%
> rename from Documentation/media/v4l-drivers/index.rst
> rename to Documentation/userspace-api/media/drivers/index.rst
> index ee7faff88a33..05a82f8c0c99 100644
> --- a/Documentation/media/v4l-drivers/index.rst
> +++ b/Documentation/userspace-api/media/drivers/index.rst
> @@ -2,7 +2,7 @@
>  
>  .. include:: <isonum.txt>
>  
> -.. _v4l-drivers:
> +.. _v4l-drivers_uapi:
>  
>  ################################################
>  Video4Linux (V4L)  driver-specific documentation
> @@ -31,10 +31,9 @@ For more details see the file COPYING in the source distribution of Linux.
>  	:maxdepth: 5
>  	:numbered:
>  
> -	max2175
> -	uvcvideo
> -
>  	cx2341x-uapi
>  	imx-uapi
> +	max2175
>  	meye-uapi
>  	omap3isp-uapi
> +	uvcvideo
> diff --git a/Documentation/media/v4l-drivers/max2175.rst b/Documentation/userspace-api/media/drivers/max2175.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/max2175.rst
> rename to Documentation/userspace-api/media/drivers/max2175.rst
> diff --git a/Documentation/media/v4l-drivers/meye-uapi.rst b/Documentation/userspace-api/media/drivers/meye-uapi.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/meye-uapi.rst
> rename to Documentation/userspace-api/media/drivers/meye-uapi.rst
> diff --git a/Documentation/media/v4l-drivers/omap3isp-uapi.rst b/Documentation/userspace-api/media/drivers/omap3isp-uapi.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/omap3isp-uapi.rst
> rename to Documentation/userspace-api/media/drivers/omap3isp-uapi.rst
> diff --git a/Documentation/media/v4l-drivers/uvcvideo.rst b/Documentation/userspace-api/media/drivers/uvcvideo.rst
> similarity index 100%
> rename from Documentation/media/v4l-drivers/uvcvideo.rst
> rename to Documentation/userspace-api/media/drivers/uvcvideo.rst
> diff --git a/Documentation/userspace-api/media/index.rst b/Documentation/userspace-api/media/index.rst
> index 614310f82395..bcfdd1a5caa0 100644
> --- a/Documentation/userspace-api/media/index.rst
> +++ b/Documentation/userspace-api/media/index.rst
> @@ -31,3 +31,5 @@ entitled "GNU Free Documentation License".
>      cec/cec-api
>      gen-errors
>      fdl-appendix
> +
> +    drivers/index
> diff --git a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
> index 751c6590e774..dd0b6646beb5 100644
> --- a/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
> +++ b/Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
> @@ -438,7 +438,7 @@ MPEG stream.
>  *Historical context*: This format specification originates from a
>  custom, embedded, sliced VBI data format used by the ``ivtv`` driver.
>  This format has already been informally specified in the kernel sources
> -in the file ``Documentation/media/v4l-drivers/cx2341x-uapi.rst`` . The
> +in the file ``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst`` . The
>  maximum size of the payload and other aspects of this format are driven
>  by the CX23415 MPEG decoder's capabilities and limitations with respect
>  to extracting, decoding, and displaying sliced VBI data embedded within
> diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> index f81016c97a0d..9b48338fb783 100644
> --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> @@ -116,7 +116,7 @@ enum v4l2_mpeg_stream_vbi_fmt -
>      * - ``V4L2_MPEG_STREAM_VBI_FMT_IVTV``
>        - VBI in private packets, IVTV format (documented in the kernel
>  	sources in the file
> -	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``)
> +	``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst``)

This chunk (and several others like this one) does not appear to belong to
this patch. It looks like they really should be merged with patch 19 instead.

Regards,

	Hans

>  
>  
>  
> diff --git a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
> index dbdcf6c9f072..59b9e7238f90 100644
> --- a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
> +++ b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
> @@ -58,7 +58,7 @@ please make a proposal on the linux-media mailing list.
>        - YUV 4:2:0 format used by the IVTV driver.
>  
>  	The format is documented in the kernel sources in the file
> -	``Documentation/media/v4l-drivers/cx2341x-uapi.rst``
> +	``Documentation/userspace-api/media/drivers/cx2341x-uapi.rst``
>      * .. _V4L2-PIX-FMT-CPIA1:
>  
>        - ``V4L2_PIX_FMT_CPIA1``
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cf4fd454e053..a883c2e53b86 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -10135,7 +10135,7 @@ L:	linux-media@vger.kernel.org
>  T:	git git://linuxtv.org/media_tree.git
>  S:	Maintained
>  F:	Documentation/devicetree/bindings/media/i2c/max2175.txt
> -F:	Documentation/media/v4l-drivers/max2175.rst
> +F:	Documentation/userspace-api/media/drivers/max2175.rst
>  F:	drivers/media/i2c/max2175*
>  F:	include/uapi/linux/max2175.h
>  
> @@ -11251,7 +11251,7 @@ F:	kernel/module.c
>  MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
>  W:	http://popies.net/meye/
>  S:	Orphan
> -F:	Documentation/media/v4l-drivers/meye*
> +F:	Documentation/userspace-api/media/drivers/meye*
>  F:	drivers/media/pci/meye/
>  F:	include/uapi/linux/meye.h
>  
> diff --git a/drivers/media/i2c/max2175.c b/drivers/media/i2c/max2175.c
> index 506a30e69ced..03b4ed3a61b8 100644
> --- a/drivers/media/i2c/max2175.c
> +++ b/drivers/media/i2c/max2175.c
> @@ -1194,7 +1194,7 @@ static const struct v4l2_ctrl_ops max2175_ctrl_ops = {
>  
>  /*
>   * I2S output enable/disable configuration. This is a private control.
> - * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
> + * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
>   */
>  static const struct v4l2_ctrl_config max2175_i2s_en = {
>  	.ops = &max2175_ctrl_ops,
> @@ -1210,7 +1210,7 @@ static const struct v4l2_ctrl_config max2175_i2s_en = {
>  
>  /*
>   * HSLS value control LO freq adjacent location configuration.
> - * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
> + * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
>   */
>  static const struct v4l2_ctrl_config max2175_hsls = {
>  	.ops = &max2175_ctrl_ops,
> @@ -1226,7 +1226,7 @@ static const struct v4l2_ctrl_config max2175_hsls = {
>  /*
>   * Rx modes below are a set of preset configurations that decides the tuner's
>   * sck and sample rate of transmission. They are separate for EU & NA regions.
> - * Refer to Documentation/media/v4l-drivers/max2175.rst for more details.
> + * Refer to Documentation/userspace-api/media/drivers/max2175.rst for more details.
>   */
>  static const char * const max2175_ctrl_eu_rx_modes[] = {
>  	[MAX2175_EU_FM_1_2]	= "EU FM 1.2",
> 


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-03-12  7:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-10 13:42 [PATCH v2 00/22] Move media documentation files Mauro Carvalho Chehab
2020-03-10 13:43 ` [PATCH v2 15/22] media: docs: split uAPI info from imx.rst Mauro Carvalho Chehab
2020-03-10 13:43 ` [PATCH v2 19/22] media: docs: move user-facing docs to the admin guide Mauro Carvalho Chehab
2020-03-12  7:25   ` Hans Verkuil
2020-03-10 13:43 ` [PATCH v2 21/22] media: docs: add an uAPI chapter for driver-specific stuff Mauro Carvalho Chehab
2020-03-12  7:31   ` Hans Verkuil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).