diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-09-22 01:15:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-09-22 01:15:08 -0700 |
| commit | e3edd2d61baa39f183f7edb5ac6d7057db0462db (patch) | |
| tree | 39ecd1d50d2af0ad793edb6e13351f630ba870e2 | |
| parent | 71318b2cc0858b367f3ce96bf3ccfff5f5ca6ac0 (diff) | |
| parent | bc9ab82ec952cdfb6bd2b74f4299488093114b70 (diff) | |
| download | devicetree-e3edd2d61baa39f183f7edb5ac6d7057db0462db.tar.gz | |
Merge "ARM: dts: msm: add SMB_STAT pin configuration for khaje-qrd-hvdcp3p5"
| -rw-r--r-- | qcom/khaje-qrd-hvdcp3p5-overlay.dts | 3 | ||||
| -rw-r--r-- | qcom/khaje-qrd-hvdcp3p5.dts | 3 | ||||
| -rw-r--r-- | qcom/khaje-qrd-hvdcp3p5.dtsi | 21 | ||||
| -rw-r--r-- | qcom/khaje-qrd-nowcd9375-overlay.dts | 3 | ||||
| -rw-r--r-- | qcom/khaje-qrd-nowcd9375.dts | 3 |
5 files changed, 28 insertions, 5 deletions
diff --git a/qcom/khaje-qrd-hvdcp3p5-overlay.dts b/qcom/khaje-qrd-hvdcp3p5-overlay.dts index 490e7658..a5fb87eb 100644 --- a/qcom/khaje-qrd-hvdcp3p5-overlay.dts +++ b/qcom/khaje-qrd-hvdcp3p5-overlay.dts @@ -2,8 +2,9 @@ /plugin/; #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-hvdcp3p5.dtsi" / { model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5"; diff --git a/qcom/khaje-qrd-hvdcp3p5.dts b/qcom/khaje-qrd-hvdcp3p5.dts index c30d71b6..7b4d4935 100644 --- a/qcom/khaje-qrd-hvdcp3p5.dts +++ b/qcom/khaje-qrd-hvdcp3p5.dts @@ -1,8 +1,9 @@ /dts-v1/; #include "khaje.dtsi" -#include "khaje-qrd-hvdcp3p5.dtsi" +#include "khaje-qrd.dtsi" #include "khaje-qrd-pm7250b.dtsi" +#include "khaje-qrd-hvdcp3p5.dtsi" / { model = "Qualcomm Technologies, Inc. KHAJE QRD HVDCP3P5"; diff --git a/qcom/khaje-qrd-hvdcp3p5.dtsi b/qcom/khaje-qrd-hvdcp3p5.dtsi index 26100b35..f87a199d 100644 --- a/qcom/khaje-qrd-hvdcp3p5.dtsi +++ b/qcom/khaje-qrd-hvdcp3p5.dtsi @@ -1 +1,20 @@ -#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>; +}; diff --git a/qcom/khaje-qrd-nowcd9375-overlay.dts b/qcom/khaje-qrd-nowcd9375-overlay.dts index 25b04914..17dcc66b 100644 --- a/qcom/khaje-qrd-nowcd9375-overlay.dts +++ b/qcom/khaje-qrd-nowcd9375-overlay.dts @@ -2,8 +2,9 @@ /plugin/; #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-nowcd9375.dtsi" / { model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375"; diff --git a/qcom/khaje-qrd-nowcd9375.dts b/qcom/khaje-qrd-nowcd9375.dts index 6afc607f..891a0705 100644 --- a/qcom/khaje-qrd-nowcd9375.dts +++ b/qcom/khaje-qrd-nowcd9375.dts @@ -1,8 +1,9 @@ /dts-v1/; #include "khaje.dtsi" -#include "khaje-qrd-nowcd9375.dtsi" +#include "khaje-qrd.dtsi" #include "khaje-qrd-pm7250b.dtsi" +#include "khaje-qrd-nowcd9375.dtsi" / { model = "Qualcomm Technologies, Inc. KHAJE QRD NOWCD9375"; |