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

Commit e61b7821 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 of PMI8937/PMI8940 for MSM8953"

parents b0f604bf 0f661cf3

arch/arm/boot/dts/qcom/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -268,12 +268,20 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \ 
	apq8053-ext-codec-rcm.dtb \

	msm8953-cdp-1200p.dtb \

	msm8953-iot-mtp.dtb \

	apq8053-iot-mtp.dtb

	apq8053-iot-mtp.dtb \

	msm8953-pmi8940-cdp.dtb \

	msm8953-pmi8940-mtp.dtb \

	msm8953-pmi8937-cdp.dtb \

	msm8953-pmi8937-mtp.dtb \

	msm8953-pmi8940-ext-codec-mtp.dtb \

	msm8953-pmi8937-ext-codec-mtp.dtb



dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \

	sdm450-cdp.dtb \

	sdm450-mtp.dtb \

	sdm450-qrd.dtb

	sdm450-qrd.dtb \

	sdm450-pmi8940-mtp.dtb \

	sdm450-pmi8937-mtp.dtb



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

	mdm9607-cdp.dtb \

arch/arm/boot/dts/qcom/apq8053-cdp.dts

+10 −2
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
@@ -14,10 +14,18 @@ 
/dts-v1/;



#include "apq8053.dtsi"

#include "msm-pmi8950.dtsi"

#include "msm8953-cdp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 CDP";

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 CDP";

	compatible = "qcom,apq8053-cdp", "qcom,apq8053", "qcom,cdp";

	qcom,board-id= <1 0>;

};



&pmi8950_charger {

	qcom,external-typec;

	qcom,typec-psy-name = "typec";

};

arch/arm/boot/dts/qcom/apq8053-ext-audio-mtp.dts

+25 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-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
@@ -14,14 +14,37 @@ 
/dts-v1/;



#include "apq8053.dtsi"

#include "msm-pmi8950.dtsi"

#include "msm8953-mtp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 External Codec MTP";

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 Ext Codec MTP";

	compatible = "qcom,apq8053-mtp", "qcom,apq8053", "qcom,mtp";

	qcom,board-id= <8 1>;

};



/{

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "batterydata-itech-3000mah.dtsi"

		#include "batterydata-ascent-3450mAh.dtsi"

	};

};



&pmi8950_fg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pmi8950_charger {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	qcom,external-typec;

	qcom,typec-psy-name = "typec";

};



&int_codec {

	status = "disabled";

};

arch/arm/boot/dts/qcom/apq8053-ext-codec-rcm.dts

+8 −0
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ 
/dts-v1/;



#include "apq8053.dtsi"

#include "msm-pmi8950.dtsi"

#include "msm8953-cdp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 External Codec RCM";
@@ -112,3 +115,8 @@ 
		bias-pull-down;

	};

};



&pmi8950_charger {

	qcom,external-typec;

	qcom,typec-psy-name = "typec";

};

arch/arm/boot/dts/qcom/apq8053-iot-mtp.dts

+24 −1
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ 
/dts-v1/;



#include "apq8053.dtsi"

#include "msm-pmi8950.dtsi"

#include "msm8953-mtp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-mtp.dtsi"

#include "apq8053-camera-sensor-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 IOT MTP";

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 IOT MTP";

	compatible = "qcom,apq8053-mtp", "qcom,apq8053", "qcom,mtp";

	qcom,board-id= <8 2>;

};
@@ -163,3 +166,23 @@ 
		bias-pull-down;

	};

};



/{

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "batterydata-itech-3000mah.dtsi"

		#include "batterydata-ascent-3450mAh.dtsi"

	};

};



&pmi8950_fg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pmi8950_charger {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,chg-led-sw-controls;

	qcom,chg-led-support;

	qcom,external-typec;

	qcom,typec-psy-name = "typec";

};