Skip to content

Remove media controller entity subtypes and rename types

Mauro Carvalho Chehab linux-api linux-arm-kernel linux-media linux-samsung-soc 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 of 18 patches 18 repliesIn review

16 of 18 patches are in this archive. The cover letter announces 18.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18media controller: add EXPERIMENTAL to Kconfig option for DVB supportdrivers/media/Kconfig+1 -12 replies
2/18media controller: deprecate entity subtypeinclude/uapi/linux/media.h+29 -151 reply
4/18media controller: Rename camera entitiesDocumentation/DocBook/media/v4l/media-ioc-enum-entities.xml drivers/media/i2c/adp1653.c drivers/media/i2c/as3645a.c +11 more+24 -223 replies
6/18media controller: rename analog TV decoderDocumentation/DocBook/media/v4l/media-ioc-enum-entities.xml drivers/media/i2c/adv7180.c drivers/media/i2c/cx25840/cx25840-core.c +5 more+11 -91 reply
7/18media controller: rename the tuner entityDocumentation/DocBook/media/v4l/media-ioc-enum-entities.xml drivers/media/dvb-core/dvbdev.c drivers/media/usb/cx231xx/cx231xx-cards.c +2 more+7 -59 replies
8/18media controller: add comments for the entity typesinclude/uapi/linux/media.h+6 -00 replies
9/18media controller: add macros to check if subdev or A/V DMAinclude/media/media-entity.h+29 -00 replies
10/18media controller: use macros to check for V4L2 subdev entitiesdrivers/media/platform/exynos4-is/common.c drivers/media/platform/exynos4-is/fimc-capture.c drivers/media/platform/exynos4-is/fimc-isp-video.c +11 more+39 -541 reply
10/18media controller: use macros to check for V4L2 subdev entities+0 -00 replies
11/18omap3/omap4/davinci: get rid of MEDIA_ENT_T_V4L2_SUBDEV abusedrivers/media/platform/omap3isp/ispccdc.c drivers/media/platform/omap3isp/ispccp2.c drivers/media/platform/omap3isp/ispcsi2.c +8 more+102 -470 replies
12/18s5c73m3: fix subdev typedrivers/media/i2c/s5c73m3/s5c73m3-core.c+2 -20 replies
13/18s5k5baf: fix subdev typedrivers/media/i2c/s5k5baf.c+1 -12 replies
14/18davinci_vbpe: stop MEDIA_ENT_T_V4L2_SUBDEV abusedrivers/staging/media/davinci_vpfe/dm365_ipipe.c drivers/staging/media/davinci_vpfe/vpfe_video.c+8 -60 replies
15/18omap4iss: stop MEDIA_ENT_T_V4L2_SUBDEV abusedrivers/staging/media/omap4iss/iss_ipipe.c+5 -20 replies
17/18media controller: get rid of entity subtype on Kernelinclude/media/media-entity.h include/uapi/linux/media.h+3 -120 replies
18/18DocBook: update descriptions for the media controller entitiesDocumentation/DocBook/media/v4l/media-ioc-enum-entities.xml+12 -230 replies

Reviews trailers per patch

2 of 16 patches have a Reviewed-by or Acked-by.

PatchHans VerkuilLaurent Pinchart
1/18A-b A-b
2/18A-b
4/18
6/18
7/18
8/18
9/18
10/18
10/18
11/18
12/18
13/18
14/18
15/18
17/18
18/18

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/18] Remove media controller entity subtypes and rename types

The media controller entity subtype doesn't make much sense, especially since V4L2 subdevices may also have associated devnodes.

So, better to get rid of it while it is not too late.

Also, the entities namespace is a bit messy, putting tuners under V4L2, while this kind of entity could also be used by radio and digital TV.

This patchset addresses the entities namespace and gets rid of entity subtypes.

We need, of course, to keep the old symbols to avoid userspace breakage.

Inside the Kernel, however, the previous subtype defines should not be used.

The first patches in this series are just namespace renames, and were done mostly using scripts. So, they shouln't cause much discussons, except if someone doesn't like the new names I gave :)

Mauro Carvalho Chehab (8):
media controller: add EXPERIMENTAL to Kconfig option for DVB support media controller: deprecate entity subtype
media controller: use MEDIA_ENT_T_AV_DMA for A/V DMA engines media controller: Rename camera entities
media controller: rename MEDIA_ENT_T_DEVNODE_DVB entities media controller: rename analog TV decoder
media controller: rename the tuner entity
media controller: add comments for the entity types

The next 9 patches, however, remove the entities subtype dependency from the drivers and core. They were highly done using cut and paste. I did several reviews on them, but I won't doubt that some dumb error were introduced. So, please review them carefully.

The last one is just documentation cleanups.

Mauro Carvalho Chehab (10):
media controller: add macros to check if subdev or A/V DMA media controller: use macros to check for V4L2 subdev entities omap3/omap4/davinci: get rid of MEDIA_ENT_T_V4L2_SUBDEV abuse
s5c73m3: fix subdev type
s5k5baf: fix subdev type
davinci_vbpe: stop MEDIA_ENT_T_V4L2_SUBDEV abuse
omap4iss: stop MEDIA_ENT_T_V4L2_SUBDEV abuse
v4l2-subdev: use MEDIA_ENT_T_UNKNOWN for new subdevs media controller: get rid of entity subtype on Kernel
DocBook: update descriptions for the media controller entities

 .../DocBook/media/v4l/media-ioc-enum-entities.xml  | 57 +++++++----------
 drivers/media/Kconfig                              |  2 +-
 drivers/media/dvb-core/dvbdev.c                    | 20 +++---
 drivers/media/i2c/adp1653.c                        |  2 +-
 drivers/media/i2c/adv7180.c                        |  2 +-
 drivers/media/i2c/as3645a.c                        |  2 +-
 drivers/media/i2c/cx25840/cx25840-core.c           |  2 +-
 drivers/media/i2c/lm3560.c                         |  2 +-
 drivers/media/i2c/lm3646.c                         |  2 +-
 drivers/media/i2c/m5mols/m5mols_core.c             |  2 +-
 drivers/media/i2c/noon010pc30.c                    |  2 +-
 drivers/media/i2c/ov2659.c                         |  2 +-
 drivers/media/i2c/ov9650.c                         |  2 +-
 drivers/media/i2c/s5c73m3/s5c73m3-core.c           |  4 +-
 drivers/media/i2c/s5k4ecgx.c                       |  2 +-
 drivers/media/i2c/s5k5baf.c                        |  6 +-
 drivers/media/i2c/s5k6aa.c                         |  2 +-
 drivers/media/i2c/smiapp/smiapp-core.c             |  2 +-
 drivers/media/i2c/tvp514x.c                        |  2 +-
 drivers/media/i2c/tvp7002.c                        |  2 +-
 drivers/media/platform/exynos4-is/common.c         |  3 +-
 drivers/media/platform/exynos4-is/fimc-capture.c   |  5 +-
 drivers/media/platform/exynos4-is/fimc-isp-video.c |  3 +-
 drivers/media/platform/exynos4-is/fimc-lite.c      | 10 ++-
 drivers/media/platform/exynos4-is/media-dev.c      |  7 +--
 drivers/media/platform/omap3isp/isp.c              | 14 ++---
 drivers/media/platform/omap3isp/ispccdc.c          | 15 +++--
 drivers/media/platform/omap3isp/ispccp2.c          | 13 ++--
 drivers/media/platform/omap3isp/ispcsi2.c          | 10 ++-
 drivers/media/platform/omap3isp/isppreview.c       | 15 +++--
 drivers/media/platform/omap3isp/ispresizer.c       | 13 ++--
 drivers/media/platform/omap3isp/ispvideo.c         |  7 +--
 drivers/media/platform/s3c-camif/camif-capture.c   |  2 +-
 drivers/media/platform/vsp1/vsp1_video.c           |  9 ++-
 drivers/media/platform/xilinx/xilinx-dma.c         |  8 +--
 drivers/media/usb/cx231xx/cx231xx-cards.c          |  4 +-
 drivers/media/usb/cx231xx/cx231xx-video.c          |  2 +-
 drivers/media/v4l2-core/tuner-core.c               |  2 +-
 drivers/media/v4l2-core/v4l2-dev.c                 |  2 +-
 drivers/media/v4l2-core/v4l2-subdev.c              |  6 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |  9 ++-
 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 13 ++--
 drivers/staging/media/davinci_vpfe/dm365_isif.c    | 13 ++--
 drivers/staging/media/davinci_vpfe/dm365_resizer.c | 22 ++++---
 drivers/staging/media/davinci_vpfe/vpfe_video.c    | 11 ++--
 drivers/staging/media/omap4iss/iss.c               | 14 ++---
 drivers/staging/media/omap4iss/iss_csi2.c          | 11 +++-
 drivers/staging/media/omap4iss/iss_ipipe.c         |  7 ++-
 drivers/staging/media/omap4iss/iss_ipipeif.c       | 13 ++--
 drivers/staging/media/omap4iss/iss_resizer.c       | 11 +++-
 drivers/staging/media/omap4iss/iss_video.c         |  5 +-
 include/media/media-entity.h                       | 27 ++++++--
 include/uapi/linux/media.h                         | 71 +++++++++++++++++-----
 53 files changed, 294 insertions(+), 202 deletions(-)
Signature · 1 line
2.1.0