From: Mauro Carvalho Chehab Date: Tue, 16 Feb 2016 11:20:45 +0000 (-0200) Subject: Merge branch 'fixes' into patchwork X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c755c29108f00c354e3dfa24a2a546be566f604;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'fixes' into patchwork Some macros were changed/removed at the material for v4.5. We need to sync with those changes here, in order to avoid troubles. * v4l_for_linus: [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST [media] [for,v4.5] media.h: increase the spacing between function ranges [media] media: i2c/adp1653: probe: fix erroneous return value [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline() --- 8c755c29108f00c354e3dfa24a2a546be566f604 diff --cc include/uapi/linux/media.h index 7113b1a8cb4e,f0328524be6e..6aac2f035a5d --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@@ -74,26 -74,17 +74,26 @@@ struct media_device_info /* * I/O entities */ - #define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31) - #define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32) - #define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) + #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) +/* + * 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 + 41) - #define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42) ++#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001) ++#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002) ++ + /* + * Connectors + */ + /* It is a responsibility of the entity drivers to add connectors and links */ + #define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001) + #define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002) + #define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003) /* * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and