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

Commit 79cebbdf authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Fix spmi address cells and battery data specs for sm6150"

parents 388feff2 f44a0e13

arch/arm64/boot/dts/qcom/qg-batterydata-mlp356477-2800mah.dtsi

0 → 100644
+1040 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/qcom/sm6150-idp.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
&soc {

};



/ {

	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-alium-3600mah.dtsi"

	};

};



&qupv3_se0_2uart {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sm6150-qrd.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
&soc {

};



/ {

	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-alium-3600mah.dtsi"

	};

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3-660";

arch/arm64/boot/dts/qcom/sm6150.dtsi

+8 −2
Original line number Diff line number Diff line
@@ -896,6 +896,12 @@ 
			< 1708800 MHZ_TO_MBPS(1017, 4) >,

			< 2208000 MHZ_TO_MBPS(1804, 4) >;

	};



	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-alium-3600mah.dtsi"

		#include "qg-batterydata-mlp356477-2800mah.dtsi"

	};

};



&soc {
@@ -1696,8 +1702,8 @@ 
		interrupts = <GIC_SPI 481 IRQ_TYPE_NONE>;

		qcom,ee = <0>;

		qcom,channel = <0>;

		#address-cells = <2>;

		#size-cells = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-controller;

		#interrupt-cells = <4>;

		cell-index = <0>;