Merge "ARM: dts: msm: Add UFS support for blair platforms"

This commit is contained in:
qctecmdr 2021-05-14 23:44:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7af2e72309
9 changed files with 271 additions and 9 deletions

View file

@ -1,6 +1,6 @@
/dts-v1/;
/plugin/;
#include "blair.dtsi"
#include "blair-atp.dtsi"
/ {

View file

@ -1,2 +1,194 @@
/ {
&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";
};
};
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-yupik";
};
#include "pm6350-rpm-regulator.dtsi"
#include "pm6150l-rpm-regulator.dtsi"
#include "holi-regulators-pm6350.dtsi"
#include "holi-atp.dtsi"

View file

@ -1,6 +1,6 @@
/dts-v1/;
/plugin/;
#include "blair.dtsi"
#include "blair-cdp.dtsi"
/ {

View file

@ -1,2 +1,7 @@
#include "holi-cdp-pm6125.dtsi"
/ {
};
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-yupik";
};

View file

@ -1,6 +1,6 @@
/dts-v1/;
/plugin/;
#include "blair.dtsi"
#include "blair-mtp.dtsi"
/ {

View file

@ -1,2 +1,7 @@
#include "holi-mtp-pm6125.dtsi"
/ {
};
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v4-yupik";
};

View file

@ -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>;

View file

@ -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 = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
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";
};

View file

@ -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>;
@ -3358,9 +3358,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"
@ -3375,6 +3375,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"
};