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

Commit fefec4a5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Include mdss panel dtsi in APQ8084 platform"

parents ebf34254 9a640def

arch/arm/boot/dts/qcom/apq8084-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
	};

};



#include "dsi-panel-jdi-1080p-video.dtsi"

#include "apq8084-mdss-panels.dtsi"

&dsi_jdi_1080_vid {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

arch/arm/boot/dts/qcom/apq8084-liquid.dtsi

+1 −4
Original line number Diff line number Diff line
@@ -140,10 +140,7 @@ 
	};

};



#include "dsi-panel-jdi-dualmipi0-video.dtsi"

#include "dsi-panel-jdi-dualmipi1-video.dtsi"

#include "dsi-panel-jdi-dualmipi0-cmd.dtsi"

#include "dsi-panel-jdi-dualmipi1-cmd.dtsi"

#include "apq8084-mdss-panels.dtsi"



&dsi_dual_jdi_video_0 {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

arch/arm/boot/dts/qcom/apq8084-mdss-panels.dtsi

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "dsi-panel-jdi-1080p-video.dtsi"

#include "dsi-panel-jdi-dualmipi0-video.dtsi"

#include "dsi-panel-jdi-dualmipi1-video.dtsi"

#include "dsi-panel-jdi-dualmipi0-cmd.dtsi"

#include "dsi-panel-jdi-dualmipi1-cmd.dtsi"

arch/arm/boot/dts/qcom/apq8084-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
	qcom,conditional-power-on;

};



#include "dsi-panel-jdi-1080p-video.dtsi"

#include "apq8084-mdss-panels.dtsi"

&dsi_jdi_1080_vid {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;