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

Commit c0895d7d authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch qc2 into vanilla

parents ff68672e d984c81f

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ Optional properties: 
					255 = default value.

- qcom,mdss-brightness-max-level:	Specifies the max brightness level supported.

					255 = default value.

- qcom,bl-update-flag:			A string that specifies controls for backlight update of the panel.

					"delay_until_first_frame" = Delay backlight update of the panel

					until the first frame is received from the HW.

- qcom,mdss-dsi-interleave-mode:	Specifies interleave mode.

					0 = default value.

- qcom,mdss-dsi-panel-type:		Specifies the panel operating mode.
@@ -600,6 +603,7 @@ Example: 
		qcom,mdss-dsi-bl-min-level = <1>;

		qcom,mdss-dsi-bl-max-level = < 15>;

		qcom,mdss-brightness-max-level = <255>;

		qcom,bl-update-flag = "delay_until_first_frame";

		qcom,mdss-dsi-interleave-mode = <0>;

		qcom,mdss-dsi-panel-type = "dsi_video_mode";

		qcom,mdss-dsi-te-check-enable;

arch/arm/configs/msm8937_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ CONFIG_PANIC_ON_RT_THROTTLING=y 
CONFIG_SCHEDSTATS=y

CONFIG_SCHED_STACK_END_CHECK=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LIST=y

arch/arm/configs/msm8937go_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ CONFIG_PANIC_ON_SCHED_BUG=y 
CONFIG_PANIC_ON_RT_THROTTLING=y

CONFIG_SCHED_STACK_END_CHECK=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LIST=y

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, 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
@@ -512,7 +512,7 @@ 
		};

	};



	qcom,msm-dai-tdm-quat-rx {

	msm_dai_tdm_quat_rx: qcom,msm-dai-tdm-quat-rx {

		compatible = "qcom,msm-dai-tdm";

		qcom,msm-cpudai-tdm-group-id = <37168>;

		qcom,msm-cpudai-tdm-group-num-ports = <1>;

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, 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
@@ -284,6 +284,7 @@ 
			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;

			qcom,adc_tm-vadc = <&pm8937_vadc>;

			#thermal-sensor-cells = <1>;



			chan@36 {

				label = "pa_therm0";