diff options
| -rw-r--r-- | bindings/power/supply/qcom/qpnp-smb5.txt | 10 | ||||
| -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 | ||||
| -rw-r--r-- | qcom/pm7250b.dtsi | 1 |
7 files changed, 38 insertions, 6 deletions
diff --git a/bindings/power/supply/qcom/qpnp-smb5.txt b/bindings/power/supply/qcom/qpnp-smb5.txt index f261dbd6..c1359c1c 100644 --- a/bindings/power/supply/qcom/qpnp-smb5.txt +++ b/bindings/power/supply/qcom/qpnp-smb5.txt @@ -368,9 +368,17 @@ Charger specific properties: Usage: optional Value type: <u32> Definition: Specifies the maximum input current limit that can be configured - for HVDCP2 adapter. + for HVDCP2 adapter when it's working at 5V and 9V. If left unspecified, the default value is 3000mA. +- qcom,hvdcp2-12v-max-icl-ua + Usage: optional + Value type: <u32> + Definition: Specifies the maximum input current limit that can be configured + for HVDCP2 adapter when it's working at 12V. + If left unspecified, the default value is the same value + specified in "qcom,hvdcp2-max-icl-ua". + - qcom,hvdcp3-max-icl-ua Usage: optional Value type: <u32> 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"; diff --git a/qcom/pm7250b.dtsi b/qcom/pm7250b.dtsi index 02860de3..5f6a40a2 100644 --- a/qcom/pm7250b.dtsi +++ b/qcom/pm7250b.dtsi @@ -35,6 +35,7 @@ 1000000 500000>; qcom,pmic-revid = <&pm7250b_revid>; qcom,hvdcp2-max-icl-ua = <2000000>; + qcom,hvdcp2-12v-max-icl-ua = <1500000>; qcom,chgr@1000 { reg = <0x1000 0x100>; |