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

Commit ccea77b1 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: use physical PMIC chips on SDM855 RUMI"

parents 4236a288 4f29d956

arch/arm64/boot/dts/qcom/sdm855-cdp.dtsi

+1 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -10,11 +10,6 @@ 
 * GNU General Public License for more details.

 */



&soc {

	spmi_bus: qcom,spmi@c440000 {

	};

};



#include "sdm855-pmic-overlay.dtsi"



&qupv3_se12_2uart {

arch/arm64/boot/dts/qcom/sdm855-mtp.dtsi

+1 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -10,11 +10,6 @@ 
 * GNU General Public License for more details.

 */



&soc {

	spmi_bus: qcom,spmi@c440000 {

	};

};



#include "sdm855-pmic-overlay.dtsi"



&qupv3_se12_2uart {

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

+1 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -10,9 +10,4 @@ 
 * GNU General Public License for more details.

 */



&soc {

	spmi_bus: qcom,spmi@c440000 {

	};

};



#include "sdm855-pmic-overlay.dtsi"

arch/arm64/boot/dts/qcom/sdm855-rumi.dtsi

+0 −27
Original line number Diff line number Diff line
@@ -57,33 +57,6 @@ 
			     <0 425 0 /* CE11 */ >;

		qcom,wlan-msa-memory = <0x100000>;

	};



	spmi_bus: spmi-sim {

		compatible = "qcom,spmi-sim";

		reg = <0x00000 0x60000>;

		#address-cells = <2>;

		#size-cells = <0>;

		interrupt-controller;

		#interrupt-cells = <4>;

	};



	pm855-sim {

		compatible = "qcom,pm855-sim";

		qcom,spmi-sim = <&spmi_bus>;

		qcom,sid-offset = <0>;

	};



	pm855b-sim {

		compatible = "qcom,pm855b-sim";

		qcom,spmi-sim = <&spmi_bus>;

		qcom,sid-offset = <2>;

	};



	pm855l-sim {

		compatible = "qcom,pm855l-sim";

		qcom,spmi-sim = <&spmi_bus>;

		qcom,sid-offset = <4>;

	};

};



#include "sdm855-pmic-overlay.dtsi"

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

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ 
		#clock-cells = <1>;

	};



	qcom,spmi@c440000 {

	spmi_bus: qcom,spmi@c440000 {

		compatible = "qcom,spmi-pmic-arb";

		reg = <0xc440000 0x1100>,

		      <0xc600000 0x2000000>,