diff options
| author | Hanumant Singh <hanumant@codeaurora.org> | 2016-05-10 16:50:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-14 01:00:47 -0700 |
| commit | e4f49bea67d8c903a7160ef1961bb9cedbb76aad (patch) | |
| tree | 0814de271cb69068f0e8b8a32e650ff4ba8ae566 | |
| parent | db160719ad4b1f3a70a88ee70f87ee91bb75dc13 (diff) | |
ARM: dts: msm: Add pin setup for modem-QSPI mux on 8996
Auto platforms have an external mux that needs to be setup
to choose between QSPI and modem. Prior to the modem being
loaded, the mux needs to be setup for modem to use the pin.
This is a one time configuration at bootup, that is performed
by pil driver.
CRs-Fixed: 1010787
Change-Id: Ibab421fadef7e591ec84225aa4be7b55d0a54e0c
Signed-off-by: Hanumant Singh <hanumant@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts | 5 |
4 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi index 0b7be6a056f3..ff128acb376a 100644 --- a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi @@ -20,6 +20,20 @@ interrupt-controller; #interrupt-cells = <2>; + /* pin governing mux between QSPI and modem on auto boards */ + modem_mux: mdm_mux { + mux { + pins = "gpio121"; + function = "gpio"; + }; + + config { + pins = "gpio121"; + drive-strength = <2>; + bias-pull-up; + output-high; + }; + }; /* add pingrp for adv7533 */ pmx_adv7533: pmx_adv7533 { adv7533_0_int_active: adv7533_0_int_active { diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts index 1c92a9a1a8c1..04625b9e0b7e 100644 --- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts @@ -23,6 +23,11 @@ qcom,board-id = <0x03010001 0>; }; +&pil_modem { + pinctrl-names = "default"; + pinctrl-0 = <&modem_mux>; +}; + &spi_9 { status = "ok"; can-controller@0 { diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts index ad38744e4490..926ac5e6de44 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts @@ -41,6 +41,11 @@ }; }; +&pil_modem { + pinctrl-names = "default"; + pinctrl-0 = <&modem_mux>; +}; + &slim_msm { status = "disabled"; }; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts index 74404827bf5a..e316f7af05f2 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts @@ -34,6 +34,11 @@ }; }; +&pil_modem { + pinctrl-names = "default"; + pinctrl-0 = <&modem_mux>; +}; + &gfx_vreg { qcom,cpr-voltage-ceiling = /* Speed bin 0 */ |