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

Commit 887e95a9 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 overlay/non-overlay support for SDM450 no-pmi config"

parents f7771c36 5c526199
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \
	sdm450-cdp-s2-overlay.dtbo \
	sdm450-mtp-s3-overlay.dtbo \
	sdm450-qrd-sku4-overlay.dtbo\
	sdm450-no-pmi-overlay.dtbo
	sdm450-no-pmi-mtp-overlay.dtbo

dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \
	sdm450-cdp-s2-overlay.dtbo \
@@ -481,7 +481,7 @@ sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \
	sdm632.dtb \
	sdm632-pm8004.dtb

sdm450-no-pmi-overlay.dtbo-base := sdm450-no-pmi.dtb
sdm450-no-pmi-mtp-overlay.dtbo-base := sdm450-no-pmi.dtb

sdm632-rumi-overlay.dtbo-base := sdm632.dtb
sdm632-ext-codec-cdp-s3-overlay.dtbo-base := sdm632.dtb \
@@ -612,7 +612,7 @@ dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \
	sdm450-pmi632-mtp-s3.dtb \
	sda450-pmi632-cdp-s2.dtb \
	sda450-pmi632-mtp-s3.dtb \
	sdm450-no-pmi.dtb
	sdm450-no-pmi-mtp.dtb

dtb-$(CONFIG_ARCH_SDM632) += sdm632-rumi.dtb \
	sdm632-cdp-s2.dtb \
+21 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 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
 * 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/;
/plugin/;

/ {
	model = " SDM450 NOPMI MTP";
	qcom,board-id = <8 3>;
};
+69 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 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
 * 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 "sdm450.dtsi"
#include "msm8953-mtp.dtsi"
/ {
	model = "Qualcomm Technologies, Inc. SDM450 + NO PMI MTP S3";
	compatible = "qcom,sdm450-mtp", "qcom,sdm450", "qcom,mtp";
	qcom,board-id = <8 3>;
	qcom,pmic-id = <0x010016 0x0 0x0 0x0>;
};

&eeprom0 {
	cam_vdig-supply = <&pm8953_l23>;
};

&camera0 {
	cam_vdig-supply = <&pm8953_l23>;
};

&pm8953_gpios {
	bklt_en {
		bklt_en_default: bklt_en_default {
		pins = "gpio4";
		function = "normal";
		power-source = <0>;
		output-high;
		};
	};
};

&pm8953_pwm {
	status = "ok";
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_truly_vid>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active &bklt_en_default>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,platform-bklight-en-gpio = <&pm8953_gpios 4 0>;

};

&dsi_truly_1080_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 = <&pm8953_gpios 8 0>;
};

&dsi_hx8399c_truly_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 = <&pm8953_gpios 8 0>;
};
+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
/ {
	model = "Qualcomm Technologies, Inc. SDM450 + NO PMI MTP S3";
	compatible = "qcom,sdm450-mtp", "qcom,sdm450", "qcom,mtp";
	qcom,board-id = <8 3>;
	qcom,pmic-id = <0x010016 0x0 0x0 0x0>;
};

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@
/ {
	model = "Qualcomm Technologies, Inc. SDM450 + PMI632 SOC";
	compatible = "qcom,sdm450";
	qcom,board-id = <8 3>;
	qcom,pmic-id = <0x16 0x25 0x0 0x0>;
	qcom,pmic-name = "PMI632";
};