Merge branch 'v4l_for_linus' into patchwork

We need to import the changes at media.h, as we have a
followup patch that depends on it.

* v4l_for_linus:
  [media] media.h: use hex values for range offsets,  move connectors base up.
  [media] adv7604: fix tx 5v detect regression

diff --cc drivers/media/i2c/adv7604.c
Simple merge

diff --cc include/uapi/linux/media.h
index 95e126edb1c35450967418cc4444e975dcb2575a,13e19a18f97f98dc078e34b5285bc347c6cd9886..2e2ab13a90b01b50c406864671e33695aa2821ed
--- 1/include/uapi/linux/media.h
--- 2/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@@ -74,26 -74,10 +74,26 @@@ struct media_device_info 
  /*
   * I/O entities
   */
- #define MEDIA_ENT_F_IO_DTV            (MEDIA_ENT_F_BASE + 1001)
- #define MEDIA_ENT_F_IO_VBI            (MEDIA_ENT_F_BASE + 1002)
- #define MEDIA_ENT_F_IO_SWRADIO                (MEDIA_ENT_F_BASE + 1003)
+ #define MEDIA_ENT_F_IO_DTV            (MEDIA_ENT_F_BASE + 0x01001)
+ #define MEDIA_ENT_F_IO_VBI            (MEDIA_ENT_F_BASE + 0x01002)
+ #define MEDIA_ENT_F_IO_SWRADIO                (MEDIA_ENT_F_BASE + 0x01003)
  
 +/*
 + * Analog TV IF-PLL decoders
 + *
 + * It is a responsibility of the master/bridge drivers to create links
 + * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
 + */
 +#define MEDIA_ENT_F_IF_VID_DECODER    (MEDIA_ENT_F_BASE + 2001)
 +#define MEDIA_ENT_F_IF_AUD_DECODER    (MEDIA_ENT_F_BASE + 2002)
 +
 +/*
 + * Audio Entity Functions
 + */
 +#define MEDIA_ENT_F_AUDIO_CAPTURE     (MEDIA_ENT_F_BASE + 3000)
 +#define MEDIA_ENT_F_AUDIO_PLAYBACK    (MEDIA_ENT_F_BASE + 3001)
 +#define MEDIA_ENT_F_AUDIO_MIXER               (MEDIA_ENT_F_BASE + 3002)
 +
  /*
   * Connectors
   */