Merge "defconfig: msm: enable tv tuner driver for MSM8996"

This commit is contained in:
Linux Build Service Account 2018-01-09 15:40:32 -08:00 committed by Gerrit - the friendly Code Review server
commit d093470650
3 changed files with 17 additions and 1 deletions

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -1158,6 +1158,10 @@
<&pm8994_gpios 7 0>; /* INT3 */
};
qcom,tv-tuner {
compatible = "qcom,tv-tuner";
};
qcom,msm-ba {
compatible = "qcom,msm-ba";
qcom,ba-input-profile-0 {
@ -1179,6 +1183,16 @@
qcom,ba-node = <1>; /* ba node */
qcom,user-type = <1>; /* user type */
};
qcom,ba-input-profile-2 {
qcom,type = <8>; /* input type */
qcom,name = "TUNER-2"; /* input name */
qcom,ba-input = <16>; /* ba input id */
qcom,ba-output = <0>; /* ba output id */
qcom,sd-name = "tv-tuner"; /* sd name */
qcom,ba-node = <2>; /* ba node */
qcom,user-type = <1>; /* user type */
};
};
};

View file

@ -386,6 +386,7 @@ CONFIG_MSM_AIS_DEBUG=y
CONFIG_MSM_AIS_CAMERA_SENSOR=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_ADV7481=m
CONFIG_VIDEO_TVTUNER=m
CONFIG_QCOM_KGSL=y
CONFIG_DRM=y
CONFIG_MSM_BA_V4L2=y

View file

@ -390,6 +390,7 @@ CONFIG_MSM_AIS_DEBUG=y
CONFIG_MSM_AIS_CAMERA_SENSOR=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_ADV7481=m
CONFIG_VIDEO_TVTUNER=m
CONFIG_QCOM_KGSL=y
CONFIG_DRM=y
CONFIG_MSM_BA_V4L2=y