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

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

Merge "ARM: dts: msm: add SMB_STAT pin configuration for khaje-qrd-hvdcp3p5"

parents 71318b2c bc9ab82e
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -2,8 +2,9 @@
/plugin/;
/plugin/;


#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "khaje-qrd-hvdcp3p5.dtsi"
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-hvdcp3p5.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5";
	model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5";
+2 −1
Original line number Original line Diff line number Diff line
/dts-v1/;
/dts-v1/;


#include "khaje.dtsi"
#include "khaje.dtsi"
#include "khaje-qrd-hvdcp3p5.dtsi"
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-hvdcp3p5.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. KHAJE QRD HVDCP3P5";
	model = "Qualcomm Technologies, Inc. KHAJE QRD HVDCP3P5";
+20 −1
Original line number Original line Diff line number Diff line
#include "khaje-qrd.dtsi"
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

&pm7250b_gpios {
	pm7250b_smb_int_default: pm7250b_smb_int_default {
		pins = "gpio6";
		function = "gpio";
		input-enable;
		bias-pull-up;
		qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_30>;
		power-source = <0>;
	};
};

&smb1394 {
	qcom,enable-toggle-stat;
	pinctrl-names = "default";
	pinctrl-0 = <&pm7250b_smb_int_default>;
	interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>;
	interrupt-parent = <&spmi_bus>;
};
+2 −1
Original line number Original line Diff line number Diff line
@@ -2,8 +2,9 @@
/plugin/;
/plugin/;


#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "khaje-qrd-nowcd9375.dtsi"
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-nowcd9375.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375";
	model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375";
+2 −1
Original line number Original line Diff line number Diff line
/dts-v1/;
/dts-v1/;


#include "khaje.dtsi"
#include "khaje.dtsi"
#include "khaje-qrd-nowcd9375.dtsi"
#include "khaje-qrd.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-pm7250b.dtsi"
#include "khaje-qrd-nowcd9375.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. KHAJE QRD NOWCD9375";
	model = "Qualcomm Technologies, Inc. KHAJE QRD NOWCD9375";