Merge "ARM: dts: msm: add new board file to support 1200p on msmtitanium CDP" (0a624ad0) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,8 @@ dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \
		msmtitanium-rcm.dtb \
		msmtitanium-ext-codec-rcm.dtb \
		apqtitanium-cdp.dtb \
		apqtitanium-mtp.dtb
		apqtitanium-mtp.dtb \
		msmtitanium-cdp-1200p.dtb

		dtb-$(CONFIG_ARCH_MDM9607) += mdm9607-rumi.dtb \
		mdm9607-cdp.dtb \

arch/arm/boot/dts/qcom/dsi-panel-truly-wuxga-video.dtsi

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016, 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.
		*/

		&mdss_mdp {
		dsi_truly_wuxga_vid: qcom,mdss_dsi_truly_wuxga_video {
		qcom,mdss-dsi-panel-name = "truly wuxga video mode dsi panel";
		qcom,mdss-dsi-panel-type = "dsi_video_mode";
		qcom,mdss-dsi-panel-framerate = <60>;
		qcom,mdss-dsi-virtual-channel-id = <0>;
		qcom,mdss-dsi-stream = <0>;
		qcom,mdss-dsi-panel-width = <1920>;
		qcom,mdss-dsi-panel-height = <1200>;
		qcom,mdss-dsi-h-front-porch = <96>;
		qcom,mdss-dsi-h-back-porch = <64>;
		qcom,mdss-dsi-h-pulse-width = <16>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <16>;
		qcom,mdss-dsi-v-front-porch = <4>;
		qcom,mdss-dsi-v-pulse-width = <1>;
		qcom,mdss-dsi-h-left-border = <0>;
		qcom,mdss-dsi-h-right-border = <0>;
		qcom,mdss-dsi-v-top-border = <0>;
		qcom,mdss-dsi-v-bottom-border = <0>;
		qcom,mdss-dsi-bpp = <24>;
		qcom,mdss-dsi-underflow-color = <0xff>;
		qcom,mdss-dsi-border-color = <0>;
		qcom,mdss-dsi-h-sync-pulse = <0>;
		qcom,mdss-dsi-traffic-mode = "burst_mode";
		qcom,mdss-dsi-bllp-eof-power-mode;
		qcom,mdss-dsi-bllp-power-mode;
		qcom,mdss-dsi-lane-0-state;
		qcom,mdss-dsi-lane-1-state;
		qcom,mdss-dsi-lane-2-state;
		qcom,mdss-dsi-lane-3-state;
		qcom,mdss-dsi-panel-timings = [f3 3a 26 00 6c 6e
		2c 3e 2f 03 04 00];
		qcom,mdss-dsi-t-clk-post = <0x02>;
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,mdss-dsi-dma-trigger = "trigger_sw";
		qcom,mdss-dsi-mdp-trigger = "none";
		qcom,mdss-dsi-on-command = [32 01 00 00 00 00 02 00 00];
		qcom,mdss-dsi-off-command = [22 01 00 00 00 00 02 00 00];
		qcom,mdss-dsi-on-command-state = "dsi_hs_mode";
		qcom,mdss-dsi-off-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
		qcom,mdss-dsi-reset-sequence = <1 200>, <0 200>, <1 200>;
		};
		};

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

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016, 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
		@@ -20,6 +20,7 @@
		#include "dsi-adv7533-1080p.dtsi"
		#include "dsi-adv7533-720p.dtsi"
		#include "dsi-panel-truly-720p-video.dtsi"
		#include "dsi-panel-truly-wuxga-video.dtsi"

		&soc {
		dsi_panel_pwr_supply: dsi_panel_pwr_supply {

arch/arm/boot/dts/qcom/msmtitanium-cdp-1200p.dts

0 → 100644

+106 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, 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.
		*/

		/dts-v1/;

		#include "msmtitanium.dtsi"
		#include "msmtitanium-cdp.dtsi"
		#include "msmtitanium-audio-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSMTITANIUM CDP";
		compatible = "qcom,msmtitanium-cdp", "qcom,msmtitanium", "qcom,cdp";
		qcom,board-id= <1 1>;
		};

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_truly_wuxga_vid>;
		qcom,platform-enable-gpio = <&tlmm 12 0>;
		};


		&pmtitanium_pwm {
		status = "ok";
		};

		&pmx_mdss {
		mdss_dsi_active: mdss_dsi_active {
		mux {
		pins = "gpio12", "gpio61", "gpio59";
		function = "gpio";
		};

		config {
		pins = "gpio12", "gpio61", "gpio59";
		drive-strength = <8>; /* 8 mA */
		bias-disable = <0>; /* no pull */
		output-high;
		};
		};

		mdss_dsi_suspend: mdss_dsi_suspend {
		mux {
		pins = "gpio12", "gpio61", "gpio59";
		function = "gpio";
		};

		config {
		pins = "gpio12", "gpio61", "gpio59";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* pull down */
		};
		};
		};

		&hsuart_active {
		mux {
		pins = "gpio13", "gpio14", "gpio15";
		function = "blsp_uart4";
		};

		config {
		pins = "gpio13", "gpio14", "gpio15";
		drive-strength = <16>;
		bias-disable;
		};
		};

		&hsuart_sleep {
		mux {
		pins = "gpio13", "gpio14", "gpio15";
		function = "gpio";
		};

		config {
		pins = "gpio13", "gpio14", "gpio15";
		drive-strength = <2>;
		bias-disable;
		};
		};

		&pmtitanium_mpps {
		mpp@a300 {
		/* MPP4 - PWM config */
		qcom,mode = <1>; /* AIN input */
		qcom,invert = <1>; /* Enable MPP */
		qcom,master-en = <1>;
		qcom,src-sel = <0>; /* Function constant */
		qcom,vin-sel = <0>;
		};
		};

		&pmtitanium_vadc {
		chan@13 {
		status = "disabled";
		};
		};

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,13 @@
		qcom,panel-roi-alignment = <2 2 4 2 1080 2>;
		};

		&dsi_truly_wuxga_vid {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
		qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
		qcom,mdss-dsi-bl-pmic-bank-select = <0>;
		qcom,mdss-dsi-pwm-gpio = <&pmtitanium_mpps 4 0>;
		};

		&blsp1_uart0 {
		status = "ok";
		pinctrl-names = "default";