From 50c4771b86787eb4e495d8cae4cab19bdfdec38c Mon Sep 17 00:00:00 2001 From: Rohith Kollalsi Date: Fri, 7 May 2021 22:54:18 +0530 Subject: [PATCH 1/3] ARM: dts: msm: Add high speed PHY node on blair Add high speed PHY node and the corresponding resources to support USB high speed on blair. Also add support for eud spoof. Change-Id: I8d58d433731e346206b1dbe83fe06f872e50519b --- qcom/blair-usb.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/qcom/blair-usb.dtsi b/qcom/blair-usb.dtsi index dee02ace8c3a..c4b51bce7d5e 100644 --- a/qcom/blair-usb.dtsi +++ b/qcom/blair-usb.dtsi @@ -42,12 +42,14 @@ 0x1a4>; /* GSI_IF_STS */ qcom,dwc-usb3-msm-tx-fifo-size = <21288>; qcom,gsi-disable-io-coherency; + extcon = <&eud>; dwc3@4e00000 { compatible = "snps,dwc3"; reg = <0x4e00000 0xcd00>; interrupt-parent = <&intc>; interrupts = ; + usb-phy = <&qusb_phy0>, <&usb_nop_phy>; tx-fifo-resize; linux,sysdev_is_parent; snps,disable-clk-gating; @@ -62,6 +64,30 @@ }; }; + /* Primary USB port related QUSB2 PHY */ + qusb_phy0: qusb@162b000 { + compatible = "qcom,usb-hsphy-snps-femto"; + reg = <0x162B000 0x114>, + <0x0162A000 0x1000>; + reg-names = "hsusb_phy_base", + "eud_enable_reg"; + + vdd-supply = <&L7A>; + vdda18-supply = <&L10A>; + vdda33-supply = <&L7E>; + qcom,vdd-voltage-level = <0 880000 880000>; + + clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>; + clock-names = "ref_clk_src"; + + resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>; + reset-names = "phy_reset"; + qcom,param-override-seq = + <0xe6 0x6c /* override_x0 */ + 0x0b 0x70 /* override_x1 */ + 0x17 0x74>; /* override x2 */ + }; + usb_nop_phy: usb_nop_phy { compatible = "usb-nop-xceiv"; }; From 1ea4667cead3a2a249fc7e31fc270f645fbfaf73 Mon Sep 17 00:00:00 2001 From: Ashish Chavan Date: Thu, 6 May 2021 11:06:51 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Add initial PMIC and regulator support for blair Add initial PM6125, PMR735A and regulator support for blair. Change-Id: Ib49bad6b01f72f2b80b75d0cfb16cfede5c36a21 --- qcom/blair-atp-overlay.dts | 2 +- qcom/blair-atp.dtsi | 190 ++++++++++++++++++++++++++++++++++++- qcom/blair-cdp-overlay.dts | 2 +- qcom/blair-cdp.dtsi | 1 + qcom/blair-mtp-overlay.dts | 2 +- qcom/blair-mtp.dtsi | 1 + qcom/blair-rumi.dtsi | 2 +- qcom/blair.dtsi | 42 +++++++- 8 files changed, 233 insertions(+), 9 deletions(-) diff --git a/qcom/blair-atp-overlay.dts b/qcom/blair-atp-overlay.dts index 3cb5e6589def..c96b78ec4330 100644 --- a/qcom/blair-atp-overlay.dts +++ b/qcom/blair-atp-overlay.dts @@ -1,6 +1,6 @@ /dts-v1/; +/plugin/; -#include "blair.dtsi" #include "blair-atp.dtsi" / { diff --git a/qcom/blair-atp.dtsi b/qcom/blair-atp.dtsi index 336d7a250678..31a7cfb8f289 100644 --- a/qcom/blair-atp.dtsi +++ b/qcom/blair-atp.dtsi @@ -1,2 +1,190 @@ -/ { +&rpm_bus { + /* Delete all PM6125 and PMR735a rpm-regulators */ + /delete-node/ rpm-regulator-smpa6; + /delete-node/ rpm-regulator-smpa7; + /delete-node/ rpm-regulator-smpa8; + /delete-node/ rpm-regulator-ldoa1; + /delete-node/ rpm-regulator-ldoa2; + /delete-node/ rpm-regulator-ldoa3; + /delete-node/ rpm-regulator-ldoa4; + /delete-node/ rpm-regulator-ldoa5; + /delete-node/ rpm-regulator-ldoa6; + /delete-node/ rpm-regulator-ldoa7; + /delete-node/ rpm-regulator-ldoa8; + /delete-node/ rpm-regulator-ldoa9; + /delete-node/ rpm-regulator-ldoa10; + /delete-node/ rpm-regulator-ldoa11; + /delete-node/ rpm-regulator-ldoa12; + /delete-node/ rpm-regulator-ldoa13; + /delete-node/ rpm-regulator-ldoa14; + /delete-node/ rpm-regulator-ldoa15; + /delete-node/ rpm-regulator-ldoa16; + /delete-node/ rpm-regulator-ldoa17; + /delete-node/ rpm-regulator-ldoa18; + /delete-node/ rpm-regulator-ldoa19; + /delete-node/ rpm-regulator-ldoa20; + /delete-node/ rpm-regulator-ldoa21; + /delete-node/ rpm-regulator-ldoa22; + /delete-node/ rpm-regulator-ldoa23; + /delete-node/ rpm-regulator-ldoa24; + + /delete-node/ rpm-regulator-smpe1; + /delete-node/ rpm-regulator-smpe2; + /delete-node/ rpm-regulator-ldoe1; + /delete-node/ rpm-regulator-ldoe2; + /delete-node/ rpm-regulator-ldoe3; + /delete-node/ rpm-regulator-ldoe4; + /delete-node/ rpm-regulator-ldoe5; + /delete-node/ rpm-regulator-ldoe7; + + /* Disable all PM6125 and PMR735a rpm-regulators */ + rpm-regulator-smpa6 { + status = "disabled"; + }; + + rpm-regulator-smpa7 { + status = "disabled"; + }; + + rpm-regulator-smpa8 { + status = "disabled"; + }; + + rpm-regulator-ldoa1 { + status = "disabled"; + }; + + rpm-regulator-ldoa2 { + status = "disabled"; + }; + + rpm-regulator-ldoa3 { + status = "disabled"; + }; + + rpm-regulator-ldoa4 { + status = "disabled"; + }; + + rpm-regulator-ldoa5 { + status = "disabled"; + }; + + rpm-regulator-ldoa6 { + status = "disabled"; + }; + + rpm-regulator-ldoa7 { + status = "disabled"; + }; + + rpm-regulator-ldoa8 { + status = "disabled"; + }; + + rpm-regulator-ldoa9 { + status = "disabled"; + }; + + rpm-regulator-ldoa10 { + status = "disabled"; + }; + + rpm-regulator-ldoa11 { + status = "disabled"; + }; + + rpm-regulator-ldoa12 { + status = "disabled"; + }; + + rpm-regulator-ldoa13 { + status = "disabled"; + }; + + rpm-regulator-ldoa14 { + status = "disabled"; + }; + + rpm-regulator-ldoa15 { + status = "disabled"; + }; + + rpm-regulator-ldoa16 { + status = "disabled"; + }; + + rpm-regulator-ldoa17 { + status = "disabled"; + }; + + rpm-regulator-ldoa18 { + status = "disabled"; + }; + + rpm-regulator-ldoa19 { + status = "disabled"; + }; + + rpm-regulator-ldoa20 { + status = "disabled"; + }; + + rpm-regulator-ldoa21 { + status = "disabled"; + }; + + rpm-regulator-ldoa22 { + status = "disabled"; + }; + + rpm-regulator-ldoa23 { + status = "disabled"; + }; + + rpm-regulator-ldoa24 { + status = "disabled"; + }; + + rpm-regulator-smpe1 { + status = "disabled"; + }; + + rpm-regulator-smpe2 { + status = "disabled"; + }; + + rpm-regulator-ldoe1 { + status = "disabled"; + }; + + rpm-regulator-ldoe2 { + status = "disabled"; + }; + + rpm-regulator-ldoe3 { + status = "disabled"; + }; + + rpm-regulator-ldoe4 { + status = "disabled"; + }; + + rpm-regulator-ldoe5 { + status = "disabled"; + }; + + rpm-regulator-ldoe6 { + status = "disabled"; + }; + + rpm-regulator-ldoe7 { + status = "disabled"; + }; }; + +#include "pm6350-rpm-regulator.dtsi" +#include "pm6150l-rpm-regulator.dtsi" +#include "holi-regulators-pm6350.dtsi" + +#include "holi-atp.dtsi" diff --git a/qcom/blair-cdp-overlay.dts b/qcom/blair-cdp-overlay.dts index 040d921c2875..e4b36a584b26 100644 --- a/qcom/blair-cdp-overlay.dts +++ b/qcom/blair-cdp-overlay.dts @@ -1,6 +1,6 @@ /dts-v1/; +/plugin/; -#include "blair.dtsi" #include "blair-cdp.dtsi" / { diff --git a/qcom/blair-cdp.dtsi b/qcom/blair-cdp.dtsi index 336d7a250678..1485ffe26a9e 100644 --- a/qcom/blair-cdp.dtsi +++ b/qcom/blair-cdp.dtsi @@ -1,2 +1,3 @@ +#include "holi-cdp-pm6125.dtsi" / { }; diff --git a/qcom/blair-mtp-overlay.dts b/qcom/blair-mtp-overlay.dts index dc4692d649ac..7f1464083f57 100644 --- a/qcom/blair-mtp-overlay.dts +++ b/qcom/blair-mtp-overlay.dts @@ -1,6 +1,6 @@ /dts-v1/; +/plugin/; -#include "blair.dtsi" #include "blair-mtp.dtsi" / { diff --git a/qcom/blair-mtp.dtsi b/qcom/blair-mtp.dtsi index 336d7a250678..5b6c4bff59a4 100644 --- a/qcom/blair-mtp.dtsi +++ b/qcom/blair-mtp.dtsi @@ -1,2 +1,3 @@ +#include "holi-mtp-pm6125.dtsi" / { }; diff --git a/qcom/blair-rumi.dtsi b/qcom/blair-rumi.dtsi index 186aa810a6b4..8297cdbaae5b 100644 --- a/qcom/blair-rumi.dtsi +++ b/qcom/blair-rumi.dtsi @@ -65,7 +65,7 @@ cap-sd-highspeed; - vdd-supply = <&L9E>; + /* vdd-supply = <&L9E>; */ qcom,vdd-voltage-level = <2960000 2960000>; qcom,vdd-current-level = <0 800000>; diff --git a/qcom/blair.dtsi b/qcom/blair.dtsi index 4ef0dd0b6c34..954f2e84a93e 100644 --- a/qcom/blair.dtsi +++ b/qcom/blair.dtsi @@ -482,7 +482,7 @@ qcom,bt-sw-ctrl-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>; qcom,bt-vdd-io-supply = <&L11A>; /* IO */ qcom,bt-vdd-core-supply = <&L2E>; /* RFA */ - qcom,bt-vdd-pa-supply = <&L10E>; /* CH0 */ + /* qcom,bt-vdd-pa-supply = <&L10E>; */ /* CH0 */ qcom,bt-vdd-xtal-supply = <&L7A>; /* XO */ qcom,bt-vdd-io-config = <1700000 1900000 1 0>; @@ -3363,9 +3363,9 @@ #include "holi-gpu.dtsi" #include "blair-pinctrl.dtsi" -#include "pm6350-rpm-regulator.dtsi" -#include "pm6150l-rpm-regulator.dtsi" -#include "holi-regulators-pm6350.dtsi" +#include "pm6125-rpm-regulator.dtsi" +#include "pmr735a-rpm-regulator.dtsi" +#include "holi-regulators-pm6125.dtsi" #include "holi-gdsc.dtsi" #include "holi-ion.dtsi" #include "msm-arm-smmu-holi.dtsi" @@ -3380,6 +3380,40 @@ #include "blair-usb.dtsi" #include "ipcc-test-holi.dtsi" +&L2A { + regulator-min-microvolt = <1170000>; + regulator-max-microvolt = <1304000>; + qcom,init-voltage = <1170000>; +}; + +&L3A { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1300000>; + qcom,init-voltage = <1100000>; +}; + +&L7A { + regulator-min-microvolt = <720000>; +}; + +&L2E { + regulator-min-microvolt = <352000>; + regulator-max-microvolt = <796000>; +}; + +&L3E { + regulator-min-microvolt = <1000000>; +}; + +&L7E { + regulator-max-microvolt = <3544000>; +}; + +/* Dummy LDO handle*/ +&mdss_dsi_phy0 { + vdda-0p9-supply = <&L2A>; +}; + &gcc_camss_top_gdsc { status = "ok"; }; From a3e413264e5ff18498407d3ce379853766414813 Mon Sep 17 00:00:00 2001 From: Nitin Rawat Date: Thu, 13 May 2021 15:30:06 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add UFS support for blair platforms This change add UFS support for blair platforms. Change-Id: Ie0a2aacf320e840e2fa178cfb75ef51b227ffe77 --- qcom/blair-atp.dtsi | 4 ++++ qcom/blair-cdp.dtsi | 4 ++++ qcom/blair-mtp.dtsi | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/qcom/blair-atp.dtsi b/qcom/blair-atp.dtsi index 31a7cfb8f289..727f08b8c005 100644 --- a/qcom/blair-atp.dtsi +++ b/qcom/blair-atp.dtsi @@ -183,6 +183,10 @@ }; }; +&ufsphy_mem { + compatible = "qcom,ufs-phy-qmp-v4-yupik"; +}; + #include "pm6350-rpm-regulator.dtsi" #include "pm6150l-rpm-regulator.dtsi" #include "holi-regulators-pm6350.dtsi" diff --git a/qcom/blair-cdp.dtsi b/qcom/blair-cdp.dtsi index 1485ffe26a9e..0cec1c66625e 100644 --- a/qcom/blair-cdp.dtsi +++ b/qcom/blair-cdp.dtsi @@ -1,3 +1,7 @@ #include "holi-cdp-pm6125.dtsi" / { }; + +&ufsphy_mem { + compatible = "qcom,ufs-phy-qmp-v4-yupik"; +}; diff --git a/qcom/blair-mtp.dtsi b/qcom/blair-mtp.dtsi index 5b6c4bff59a4..e76628a3375e 100644 --- a/qcom/blair-mtp.dtsi +++ b/qcom/blair-mtp.dtsi @@ -1,3 +1,7 @@ #include "holi-mtp-pm6125.dtsi" / { }; + +&ufsphy_mem { + compatible = "qcom,ufs-phy-qmp-v4-yupik"; +};