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

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

Merge "ARM: dts: msm: Add SMB1355 device and enable it on MTP and QRD"

parents b2573825 1af407b3

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

+10 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "sm8150-camera-sensor-mtp.dtsi"

#include "sm8150-thermal-overlay.dtsi"

#include "smb1390.dtsi"

#include "smb1355.dtsi"



&qupv3_se12_2uart {

	status = "ok";
@@ -572,7 +573,7 @@ 


&smb1390 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb1390_stat_default>;

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};
@@ -583,3 +584,11 @@ 
&usb1 {

	extcon = <&extcon_usb1>;

};



&smb1355 {

	status = "ok";

};



&smb1355_charger {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sm8150-pmic-overlay.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ 
};



&pm8150b_gpios {

	smb1390_stat {

		smb1390_stat_default: smb1390_stat_default {

	smb_stat {

		smb_stat_default: smb_stat_default {

			pins = "gpio6";

			function = "normal";

			input-enable;

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

+10 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "sm8150-camera-sensor-qrd.dtsi"

#include "sm8150-thermal-overlay.dtsi"

#include "smb1390.dtsi"

#include "smb1355.dtsi"



&vendor {

	bluetooth: bt_wcn3990 {
@@ -498,7 +499,7 @@ 


&smb1390 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb1390_stat_default>;

	pinctrl-0 = <&smb_stat_default>;

	status = "ok";

};
@@ -511,3 +512,11 @@ 
		<0x49 0x70

		 0x28 0x74>;

};



&smb1355 {

	status = "ok";

};



&smb1355_charger {

	status = "ok";

};

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

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016-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

 * 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.

 */



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



&qupv3_se4_i2c {

	smb1355: qcom,smb1355@c {

		compatible = "qcom,i2c-pmic";

		reg = <0xc>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x2 0xC5 0x0 IRQ_TYPE_LEVEL_LOW>;

		interrupt_names = "smb1355";

		interrupt-controller;

		#interrupt-cells = <3>;

		qcom,periph-map = <0x10 0x12 0x13 0x16>;

		status = "disabled";



		smb1355_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";

			reg = <0x100 0x100>;

		};



		smb1355_charger: qcom,smb1355-charger@1000 {

			compatible = "qcom,smb1355";

			qcom,pmic-revid = <&smb1355_revid>;

			reg = <0x1000 0x700>;

			#address-cells = <1>;

			#size-cells = <1>;

			interrupt-parent = <&smb1355>;

			status = "disabled";



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts = <0x10 0x1 IRQ_TYPE_EDGE_RISING>;

				interrupt-names = "chg-state-change";

			};



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>,

					     <0x16 0x6 IRQ_TYPE_EDGE_RISING>;

				interrupt-names = "wdog-bark",

						  "temperature-change";

			};

		};

	};

};