Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 650a4eab authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add demux node for kernel 4.14"

parents 89f07d7e e11dc749

arch/arm64/boot/dts/qcom/trinket.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -2552,6 +2552,10 @@ 
			< 1804800 MHZ_TO_MBPS(1017, 8) >,

			< 2016000 MHZ_TO_MBPS(1804, 8) >;

	};



	demux {

		compatible = "qcom,demux";

	};

};



#include "pmi632.dtsi"

arch/arm64/configs/vendor/trinket-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ CONFIG_REGULATOR_RPM_SMD=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -414,6 +415,9 @@ CONFIG_MSM_VIDC_V4L2=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_SW=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

arch/arm64/configs/vendor/trinket_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ CONFIG_REGULATOR_RPM_SMD=y 
CONFIG_REGULATOR_STUB=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y
@@ -429,6 +430,9 @@ CONFIG_MSM_VIDC_V4L2=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_SW=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y