Merge "ARM: dts: msm: clean up display device tree for MSM8996" (e30750c5) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi

+2 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, 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
		@@ -13,6 +13,7 @@
		#include "msm8996-pinctrl.dtsi"
		#include "apq8096-camera-sensor-dragonboard.dtsi"
		#include "apq8096-ba.dtsi"
		#include "msm8996-mdss-panels.dtsi"

		/ {
		bluetooth: bt_qca6174 {
		@@ -326,8 +327,6 @@
		};
		};

		#include "msm8996-sde-display.dtsi"

		&dsi_hx8379a_fwvga_truly_vid {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
		qcom,mdss-dsi-bl-min-level = <1>;

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, 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
		@@ -14,6 +14,7 @@
		/dts-v1/;

		#include "apq8096-v2.dtsi"
		#include "msm8996-sde.dtsi"
		#include "apq8096-auto-dragonboard.dtsi"

		/ {

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, 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
		@@ -14,6 +14,7 @@
		/dts-v1/;

		#include "apq8096-v3.dtsi"
		#include "msm8996-sde.dtsi"
		#include "apq8096-auto-dragonboard.dtsi"

		/ {

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include "msm8996-pinctrl.dtsi"
		#include "msm8996-camera-sensor-adp.dtsi"
		#include "msm8996-wsa881x.dtsi"
		#include "msm8996-sde.dtsi"

		/ {
		bluetooth: bt_qca6174 {

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include "msm8996-pinctrl.dtsi"
		#include "msm8996-camera-sensor-auto-cdp.dtsi"
		#include "msm8996-wsa881x.dtsi"
		#include "msm8996-sde.dtsi"

		/ {
		bluetooth: bt_qca6174 {