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

Commit ef1c08df 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: add support for apq8998 QRD SKUK HDK board"

parents a9fff3ad 8a85954a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \
	apq8998-v2-mtp.dtb \
	apq8998-v2-cdp.dtb \
	apq8998-v2-qrd.dtb \
	apq8998-v2-qrd-skuk-hdk.dtb \
	msm8998-v2.1-mtp.dtb \
	msm8998-v2.1-cdp.dtb \
	msm8998-v2.1-qrd.dtb \
+23 −0
Original line number Diff line number Diff line
/* Copyright (c) 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
 * 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 "apq8998-v2.dtsi"
#include "msm8998-qrd-skuk-hdk.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ 8998 SKUK HDK";
	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
	qcom,board-id = <0x06000b 0x10>;
};
+138 −0
Original line number Diff line number Diff line
/* Copyright (c) 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
 * 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 "msm8998-qrd-skuk.dtsi"
#include "msm8998-camera-sensor-skuk-hdk.dtsi"

&soc {
	sound-tavil {
		qcom,msm-mbhc-hphl-swh = <0>;
	};
};

&pmx_mdss {
	mdss_dsi_active: mdss_dsi_active {
		mux {
			pins = "gpio52", "gpio94";
			function = "gpio";
		};

		config {
			pins = "gpio52", "gpio94";
			drive-strength = <8>; /* 8 mA */
			bias-disable = <0>; /* no pull */
		};
	};

	mdss_dsi_suspend: mdss_dsi_suspend {
		mux {
			pins = "gpio52", "gpio94";
			function = "gpio";
		};

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

&mdss_mdp {
	qcom,mdss-pref-prim-intf = "dsi";
};

&mdss_dsi {
	hw-config = "split_dsi";
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,platform-te-gpio = <&tlmm 10 0>;
	qcom,platform-enable-gpio = <&tlmm 52 0>;
	qcom,platform-reset-gpio = <&tlmm 94 0>;
	qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
	qcom,platform-bklight-en-gpio-invert;
};

&mdss_dsi1 {
	qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,platform-te-gpio = <&tlmm 10 0>;
	qcom,platform-enable-gpio = <&tlmm 52 0>;
	qcom,platform-reset-gpio = <&tlmm 94 0>;
	qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
	qcom,platform-bklight-en-gpio-invert;
};

&pmi8998_wled {
	qcom,disp-type-amoled;
};

&labibb {
	status = "ok";
	qcom,qpnp-labibb-mode = "amoled";
	qcom,swire-control;
};

&pmi8998_gpios {
	/* GPIO 1 for WLED power enable */
	gpio@c000 {
		qcom,mode = <1>;
		qcom,output-type = <0>;
		qcom,pull = <5>;
		qcom,vin-sel = <0>;
		qcom,out-strength = <1>;
		qcom,src-sel = <0>;
		qcom,invert = <0>;
		qcom,master-en = <1>;
		status = "okay";
	};
};

&dsi_dual_s6e3ha3_amoled_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <255>;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

&i2c_5 {
	status = "okay";
	st_fts@49 {
		compatible = "st,fts";
		reg = <0x49>;
		interrupt-parent = <&tlmm>;
		interrupts = <125 0x2008>;
		vdd-supply = <&pm8998_l6>;
		avdd-supply = <&pm8998_l28>;
		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		st,irq-gpio = <&tlmm 125 0x2008>;
		st,reset-gpio = <&tlmm 89 0x00>;
		st,regulator_dvdd = "vdd";
		st,regulator_avdd = "avdd";
	};
};

&soc {
	/* HDK835 do not use improveTouch. If do not remove this node,
	 * legacy TOUCH could not work.
	 */
	/delete-node/hbtp;
};
+1 −127
Original line number Diff line number Diff line
@@ -10,139 +10,13 @@
 * GNU General Public License for more details.
 */


/dts-v1/;

#include "msm8998-v2.dtsi"
#include "msm8998-qrd-skuk.dtsi"
#include "msm8998-camera-sensor-skuk-hdk.dtsi"
#include "msm8998-qrd-skuk-hdk.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM 8998 SKUK HDK";
	compatible = "qcom,msm8998-qrd", "qcom,msm8998", "qcom,qrd";
	qcom,board-id = <0x06000b 0x10>;
};

&soc {
	sound-tavil {
		qcom,msm-mbhc-hphl-swh = <0>;
	};
};

&pmx_mdss {
	mdss_dsi_active: mdss_dsi_active {
		mux {
			pins = "gpio52", "gpio94";
			function = "gpio";
		};

		config {
			pins = "gpio52", "gpio94";
			drive-strength = <8>; /* 8 mA */
			bias-disable = <0>; /* no pull */
		};
	};

	mdss_dsi_suspend: mdss_dsi_suspend {
		mux {
			pins = "gpio52", "gpio94";
			function = "gpio";
		};

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

&mdss_mdp {
	qcom,mdss-pref-prim-intf = "dsi";
};

&mdss_dsi {
	hw-config = "split_dsi";
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,platform-te-gpio = <&tlmm 10 0>;
	qcom,platform-enable-gpio = <&tlmm 52 0>;
	qcom,platform-reset-gpio = <&tlmm 94 0>;
	qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
	qcom,platform-bklight-en-gpio-invert;
};

&mdss_dsi1 {
	qcom,dsi-pref-prim-pan = <&dsi_dual_s6e3ha3_amoled_cmd>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,platform-te-gpio = <&tlmm 10 0>;
	qcom,platform-enable-gpio = <&tlmm 52 0>;
	qcom,platform-reset-gpio = <&tlmm 94 0>;
	qcom,platform-bklight-en-gpio = <&pmi8998_gpios 1 0>;
	qcom,platform-bklight-en-gpio-invert;
};

&pmi8998_wled {
	qcom,disp-type-amoled;
};

&labibb {
	status = "ok";
	qcom,qpnp-labibb-mode = "amoled";
	qcom,swire-control;
};

&pmi8998_gpios {
	/* GPIO 1 for WLED power enable */
	gpio@c000 {
		qcom,mode = <1>;
		qcom,output-type = <0>;
		qcom,pull = <5>;
		qcom,vin-sel = <0>;
		qcom,out-strength = <1>;
		qcom,src-sel = <0>;
		qcom,invert = <0>;
		qcom,master-en = <1>;
		status = "okay";
	};
};

&dsi_dual_s6e3ha3_amoled_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <255>;
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};

&i2c_5 {
	status = "okay";
	st_fts@49 {
		compatible = "st,fts";
		reg = <0x49>;
		interrupt-parent = <&tlmm>;
		interrupts = <125 0x2008>;
		vdd-supply = <&pm8998_l6>;
		avdd-supply = <&pm8998_l28>;
		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		st,irq-gpio = <&tlmm 125 0x2008>;
		st,reset-gpio = <&tlmm 89 0x00>;
		st,regulator_dvdd = "vdd";
		st,regulator_avdd = "avdd";
	};
};

&soc {
	/* HDK835 do not use improveTouch. If do not remove this node,
	 * legacy TOUCH could not work.
	 */
	/delete-node/hbtp;
};