From 6c59f7cb374981f2b7df45c7d1bf8d81c176790f Mon Sep 17 00:00:00 2001 From: wangyq13 Date: Sat, 3 Jul 2021 17:36:39 +0800 Subject: [PATCH] arm/dt: change corfuq configs, boot to idle - add sdhc to fix panic - add ufs for fs mount - remove camera to fix panic - remove audio for boot Change-Id: Ia579e4cb8d00458e789e50b3f282d16d277f0abb Signed-off-by: wangyq13 Reviewed-on: https://gerrit.mot.com/2001448 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiaofeng Wang Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- qcom/holi-corfuq-common-overlay.dtsi | 67 ++++++++++++++++++++++++++-- qcom/holi-corfuq-dvt1a-overlay.dts | 1 - qcom/holi-corfuq-dvt1c-overlay.dts | 1 - 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/qcom/holi-corfuq-common-overlay.dtsi b/qcom/holi-corfuq-common-overlay.dtsi index ebf47fb1dcb6..3937e16e8686 100644 --- a/qcom/holi-corfuq-common-overlay.dtsi +++ b/qcom/holi-corfuq-common-overlay.dtsi @@ -21,14 +21,14 @@ #include "holi-pm6125-moto-common-overlay.dtsi" -#include "holi-audio-overlay.dtsi" +//#include "holi-audio-overlay.dtsi" #include #include #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" #include -#include "camera/holi-camera-sensor-mot-corfup-overlay.dtsi" +#include "camera/holi-camera-pm6125-overlay.dtsi" #include "corfup-fps-overlay.dtsi" #include "corfuq-display.dtsi" #include "corfuq-touchscreen.dtsi" @@ -160,9 +160,70 @@ }; }; +/* Dummy LDO reference */ +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L24A>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L11A>; + qcom,vdd-io-always-on; + qcom,vdd-io-lpm-sup; + qcom,vdd-io-voltage-level = <1800000 1800000>; + qcom,vdd-io-current-level = <0 325000>; +}; + &sdhc_2 { status = "ok"; - cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L22A>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L5A>; + qcom,vdd-io-voltage-level = <1800000 2960000>; + qcom,vdd-io-current-level = <0 22000>; + + cd-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; +}; + +&ufsphy_mem { + compatible = "qcom,ufs-phy-qmp-v3"; + + vdda-phy-supply = <&L7A>; + vdda-pll-supply = <&L4A>; + vdda-phy-max-microamp = <62900>; + vdda-pll-max-microamp = <18300>; + + status = "ok"; +}; + +&ufshc_mem { + vdd-hba-supply = <&gcc_ufs_phy_gdsc>; + vdd-hba-fixed-regulator; + + vcc-supply = <&L24A>; + vcc-voltage-level = <2950000 2960000>; + vcc-max-microamp = <800000>; + + vccq2-supply = <&L11A>; + vccq2-max-microamp = <800000>; + vccq2-voltage-level = <1800000 1800000>; + + qcom,vddp-ref-clk-supply = <&L4A>; + qcom,vddp-ref-clk-max-microamp = <100>; + + status = "ok"; }; &qupv3_se10_i2c { diff --git a/qcom/holi-corfuq-dvt1a-overlay.dts b/qcom/holi-corfuq-dvt1a-overlay.dts index 466c03550d25..541cfa8c85a2 100644 --- a/qcom/holi-corfuq-dvt1a-overlay.dts +++ b/qcom/holi-corfuq-dvt1a-overlay.dts @@ -14,7 +14,6 @@ /plugin/; #include "holi-corfuq-common-overlay.dtsi" -#include "camera/holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi" / { model = "corfuq"; diff --git a/qcom/holi-corfuq-dvt1c-overlay.dts b/qcom/holi-corfuq-dvt1c-overlay.dts index 64b80f491bec..7d4e21e13528 100644 --- a/qcom/holi-corfuq-dvt1c-overlay.dts +++ b/qcom/holi-corfuq-dvt1c-overlay.dts @@ -14,7 +14,6 @@ /plugin/; #include "holi-corfuq-common-overlay.dtsi" -#include "camera/holi-camera-sensor-mot-corfup-dvt1-overlay.dtsi" / { model = "corfuq";