From d823e430d0539255c83b53c735d496f3690f5882 Mon Sep 17 00:00:00 2001 From: Sarthak Garg Date: Thu, 6 Aug 2020 21:16:47 +0530 Subject: [PATCH 1/2] ARM: dts: msm: Disable eMMC for holi Disable eMMC for holi so that the bus speed mode changes can be made in the main holi.dtsi file without breaking the holi RUMI as eMMC is not needed for holi RUMI. Change-Id: I751f2b0835791c7dad8cdb23857b252dddf607a9 --- qcom/holi-rumi.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcom/holi-rumi.dtsi b/qcom/holi-rumi.dtsi index f6df17e29ea1..dfb13851c1cf 100644 --- a/qcom/holi-rumi.dtsi +++ b/qcom/holi-rumi.dtsi @@ -46,7 +46,7 @@ }; &sdhc_1 { - status = "ok"; + status = "disabled"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_on>; From 208a3925c39d1e895d418f1cccc710e0f5703ce3 Mon Sep 17 00:00:00 2001 From: Sarthak Garg Date: Tue, 4 Aug 2020 18:55:36 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Add eMMC/SD dt entries in platform files for holi Add eMMC/SD dt entries for holi in platform dtsi files. Change-Id: I935326532bcabcd4b00e329bb96ed54874109b16 --- qcom/holi-atp.dtsi | 36 ++++++++++++++++++++++++++++++++++++ qcom/holi-cdp.dtsi | 36 ++++++++++++++++++++++++++++++++++++ qcom/holi-mtp-usbc.dtsi | 36 ++++++++++++++++++++++++++++++++++++ qcom/holi-mtp.dtsi | 36 ++++++++++++++++++++++++++++++++++++ qcom/holi-qrd.dtsi | 36 ++++++++++++++++++++++++++++++++++++ qcom/holi.dtsi | 5 +++++ 6 files changed, 185 insertions(+) diff --git a/qcom/holi-atp.dtsi b/qcom/holi-atp.dtsi index 510ae7ae8752..47de3f788038 100644 --- a/qcom/holi-atp.dtsi +++ b/qcom/holi-atp.dtsi @@ -4,6 +4,42 @@ #include "display/holi-sde-display-atp.dtsi" #include "holi-thermal-overlay.dtsi" +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L7E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L12A>; + 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"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L9E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L6E>; + 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"; diff --git a/qcom/holi-cdp.dtsi b/qcom/holi-cdp.dtsi index 3f19ab1b0aa3..7fa33c3389a2 100644 --- a/qcom/holi-cdp.dtsi +++ b/qcom/holi-cdp.dtsi @@ -5,6 +5,42 @@ #include "display/holi-sde-display-cdp.dtsi" #include "holi-thermal-overlay.dtsi" +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L7E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L12A>; + 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"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L9E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L6E>; + 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"; diff --git a/qcom/holi-mtp-usbc.dtsi b/qcom/holi-mtp-usbc.dtsi index 73a0c428e387..8eaf1f490424 100644 --- a/qcom/holi-mtp-usbc.dtsi +++ b/qcom/holi-mtp-usbc.dtsi @@ -3,6 +3,42 @@ #include #include "holi-pmic-overlay.dtsi" +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L7E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L12A>; + 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"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L9E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L6E>; + 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"; diff --git a/qcom/holi-mtp.dtsi b/qcom/holi-mtp.dtsi index 7ed84074af40..d389193cfde4 100644 --- a/qcom/holi-mtp.dtsi +++ b/qcom/holi-mtp.dtsi @@ -5,6 +5,42 @@ #include "display/holi-sde-display-mtp.dtsi" #include "holi-thermal-overlay.dtsi" +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L7E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L12A>; + 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"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L9E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L6E>; + 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"; diff --git a/qcom/holi-qrd.dtsi b/qcom/holi-qrd.dtsi index 40cb02d01026..1f531afd951d 100644 --- a/qcom/holi-qrd.dtsi +++ b/qcom/holi-qrd.dtsi @@ -4,6 +4,42 @@ #include "holi-pmic-overlay.dtsi" #include "holi-thermal-overlay.dtsi" +&sdhc_1 { + status = "ok"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_on>; + pinctrl-1 = <&sdc1_off>; + + vdd-supply = <&L7E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 570000>; + + vdd-io-supply = <&L12A>; + 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"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_on>; + pinctrl-1 = <&sdc2_off>; + + vdd-supply = <&L9E>; + qcom,vdd-voltage-level = <2960000 2960000>; + qcom,vdd-current-level = <0 800000>; + + vdd-io-supply = <&L6E>; + 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"; diff --git a/qcom/holi.dtsi b/qcom/holi.dtsi index d094635acd5f..20038a3c2e2d 100644 --- a/qcom/holi.dtsi +++ b/qcom/holi.dtsi @@ -2007,6 +2007,11 @@ /* DLL HSR settings. Refer go/hsr - DLL settings */ qcom,dll-hsr-list = <0x000f642c 0x0 0x0 0x00010800 0x80040868>; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + bus-width = <8>; non-removable; supports-cqe;