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

Commit e13b3810 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 PMIC peripheral devices for sdm670"

parents 4a4074d2 242bd803
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@
					   "usbin_v";

			qcom,wipower-max-uw = <5000000>;
			dpdm-supply = <&qusb_phy0>;

			/* Enable after the qusb_phy0 device node is added */
			/* dpdm-supply = <&qusb_phy0>; */

			qcom,thermal-mitigation
					= <3000000 2500000 2000000 1500000
+10 −0
Original line number Diff line number Diff line
@@ -361,3 +361,13 @@
		regulator-max-microvolt = <7>;
	};
};

&pm660_charger {
	smb2_vbus: qcom,smb2-vbus {
		regulator-name = "smb2-vbus";
	};

	smb2_vconn: qcom,smb2-vconn {
		regulator-name = "smb2-vconn";
	};
};
+20 −0
Original line number Diff line number Diff line
@@ -748,6 +748,24 @@
		reg-names = "dcc-base", "dcc-ram-base";
	};

	spmi_bus: qcom,spmi@c440000 {
		compatible = "qcom,spmi-pmic-arb";
		reg = <0xc440000 0x1100>,
		      <0xc600000 0x2000000>,
		      <0xe600000 0x100000>,
		      <0xe700000 0xa0000>,
		      <0xc40a000 0x26000>;
		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
		interrupt-names = "periph_irq";
		interrupts = <GIC_SPI 481 IRQ_TYPE_NONE>;
		qcom,ee = <0>;
		qcom,channel = <0>;
		#address-cells = <2>;
		#size-cells = <0>;
		interrupt-controller;
		#interrupt-cells = <4>;
		cell-index = <0>;
	};
};

#include "sdm670-pinctrl.dtsi"
@@ -827,4 +845,6 @@
	status = "ok";
};

#include "pm660.dtsi"
#include "pm660l.dtsi"
#include "sdm670-regulator.dtsi"