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

Commit 4e8ab4bb 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: move PMI8998 devices into overlays for sdm845"

parents e27ba0ac de33ee9e
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@

#include <dt-bindings/spmi/spmi.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/thermal/thermal.h>

&spmi_bus {
	qcom,pmi8998@2 {
	pmi8998_lsid0: qcom,pmi8998@2 {
		compatible = "qcom,spmi-pmic";
		reg = <0x2 SPMI_USID>;
		#address-cells = <2>;
@@ -335,7 +336,7 @@
		};
	};

	qcom,pmi8998@3 {
	pmi8998_lsid1: qcom,pmi8998@3 {
		compatible ="qcom,spmi-pmic";
		reg = <0x3 SPMI_USID>;
		#address-cells = <2>;
+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@
 */

#include <dt-bindings/gpio/gpio.h>
#include "sdm845-pmic-overlay.dtsi"
#include "sdm845-pinctrl-overlay.dtsi"
#include "sdm845-camera-sensor-cdp.dtsi"

&vendor {
+3 −3
Original line number Diff line number Diff line
@@ -367,18 +367,18 @@
	/delete-node/ rpmh-regulator-gfxlvl;
	/delete-node/ rpmh-regulator-msslvl;
	/delete-node/ rpmh-regulator-smpc3;
	/delete-node/ ext_5v_boost;
};

&spmi_bus {
	/delete-node/ qcom,pm8998@0;
	/delete-node/ qcom,pm8998@1;
	/delete-node/ qcom,pmi8998@2;
	/delete-node/ qcom,pmi8998@3;
	/delete-node/ qcom,pm8005@4;
	/delete-node/ qcom,pm8005@5;
};

/delete-node/ &pmi8998_lsid0;
/delete-node/ &pmi8998_lsid1;
/delete-node/ &ext_5v_boost;

#include "pm660.dtsi"
#include "pm660l.dtsi"
+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@
 */

#include <dt-bindings/gpio/gpio.h>
#include "sdm845-pmic-overlay.dtsi"
#include "sdm845-pinctrl-overlay.dtsi"
#include "sdm845-camera-sensor-mtp.dtsi"
#include "smb1355.dtsi"

+51 −0
Original line number Diff line number Diff line
/* Copyright (c) 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
 * 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.
 */

&pmi8998_gpios {
	usb2_vbus_boost {
		usb2_vbus_boost_default: usb2_vbus_boost_default {
			pins = "gpio2";
			function = "normal";
			output-low;
			power-source = <0>;
		};
	};

	usb2_vbus_det {
		usb2_vbus_det_default: usb2_vbus_det_default {
			pins = "gpio8";
			function = "normal";
			input-enable;
			bias-pull-down;
			power-source = <1>;	/* VPH input supply */
		};
	};

	usb2_id_det {
		usb2_id_det_default: usb2_id_det_default {
			pins = "gpio9";
			function = "normal";
			input-enable;
			bias-pull-up;
			power-source = <0>;
		};
	};

	usb2_ext_5v_boost {
		usb2_ext_5v_boost_default: usb2_ext_5v_boost_default {
			pins = "gpio10";
			function = "normal";
			output-low;
			power-source = <0>;
		};
	};
};
Loading