From: Mauro Carvalho Chehab Date: Thu, 3 Mar 2016 09:07:04 +0000 (-0300) Subject: Merge branch 'v4l_for_linus' into patchwork X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=664716ad013fceaa9e554100a42f99a460de3440;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 --- 664716ad013fceaa9e554100a42f99a460de3440 diff --cc include/uapi/linux/media.h index 95e126edb1c3,13e19a18f97f..2e2ab13a90b0 --- a/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 */