Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mmc/qcom,sdhci-msm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ properties:
- items:
- enum:
- qcom,eliza-sdhci
- qcom,glymur-sdhci
- qcom,hawi-sdhci
- qcom,ipq5018-sdhci
- qcom,ipq5210-sdhci
Expand Down
25 changes: 25 additions & 0 deletions arch/arm64/boot/dts/qcom/glymur-crd.dts
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,28 @@
vdda-refgen4-0p9-supply = <&vreg_l1f_e1_0p82>;
vdda-refgen4-1p2-supply = <&vreg_l4f_e1_1p08>;
};

&sdhc_2 {
vmmc-supply = <&vreg_l9b_e0_2p9>;
vqmmc-supply = <&vreg_l2b_e0_2p9>;

pinctrl-0 = <&sdc2_default_state &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_sleep_state &sdc2_card_det_n>;
pinctrl-names = "default", "sleep";

cd-gpios = <&tlmm 221 GPIO_ACTIVE_LOW>;

no-mmc;
no-sdio;

status = "okay";
};

&tlmm {
sdc2_card_det_n: sd-card-det-n-state {
pins = "gpio221";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
};
10 changes: 5 additions & 5 deletions arch/arm64/boot/dts/qcom/glymur-crd.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@

vreg_l2b_e0_2p9: ldo2 {
regulator-name = "vreg_l2b_e0_2p9";
regulator-min-microvolt = <2904000>;
regulator-min-microvolt = <1804000>;
regulator-max-microvolt = <2904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
Expand All @@ -391,10 +391,10 @@
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};

vreg_l9b_e0_2p7: ldo9 {
regulator-name = "vreg_l9b_e0_2p7";
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2704000>;
vreg_l9b_e0_2p9: ldo9 {
regulator-name = "vreg_l9b_e0_2p9";
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};

Expand Down
91 changes: 91 additions & 0 deletions arch/arm64/boot/dts/qcom/glymur.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4743,6 +4743,58 @@
#interconnect-cells = <2>;
};

sdhc_2: mmc@8804000 {
compatible = "qcom,glymur-sdhci", "qcom,sdhci-msm-v5";

reg = <0x0 0x08804000 0x0 0x1000>;
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "hc_irq",
"pwr_irq";

clocks = <&gcc GCC_SDCC2_AHB_CLK>,
<&gcc GCC_SDCC2_APPS_CLK>,
<&rpmhcc RPMH_CXO_CLK>;
clock-names = "iface",
"core",
"xo";

iommus = <&apps_smmu 0xd00 0x0>;
qcom,dll-config = <0x0007442c>;
qcom,ddr-config = <0x80040868>;

power-domains = <&rpmhpd RPMHPD_CX>;
operating-points-v2 = <&sdhc2_opp_table>;

interconnects = <&aggre3_noc MASTER_SDCC_2 QCOM_ICC_TAG_ALWAYS
&mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
<&hsc_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
&config_noc SLAVE_SDCC_2 QCOM_ICC_TAG_ACTIVE_ONLY>;
interconnect-names = "sdhc-ddr",
"cpu-sdhc";

bus-width = <4>;
dma-coherent;

resets = <&gcc GCC_SDCC2_BCR>;

status = "disabled";

sdhc2_opp_table: opp-table {
compatible = "operating-points-v2";

opp-100000000 {
opp-hz = /bits/ 64 <100000000>;
required-opps = <&rpmhpd_opp_low_svs>;
};

opp-202000000 {
opp-hz = /bits/ 64 <202000000>;
required-opps = <&rpmhpd_opp_nom>;
};
};
};

usb_2_hsphy: phy@88e0000 {
compatible = "qcom,glymur-m31-eusb2-phy",
"qcom,sm8750-m31-eusb2-phy";
Expand Down Expand Up @@ -6835,6 +6887,45 @@
bias-disable;
};
};
sdc2_default_state: sdc2-default-state {
clk-pins {
pins = "sdc2_clk";
drive-strength = <16>;
bias-disable;
};

cmd-pins {
pins = "sdc2_cmd";
drive-strength = <10>;
bias-pull-up;
};

data-pins {
pins = "sdc2_data";
drive-strength = <10>;
bias-pull-up;
};
};

sdc2_sleep_state: sdc2-sleep-state {
clk-pins {
pins = "sdc2_clk";
drive-strength = <2>;
bias-disable;
};

cmd-pins {
pins = "sdc2_cmd";
drive-strength = <2>;
bias-pull-up;
};

data-pins {
pins = "sdc2_data";
drive-strength = <2>;
bias-pull-up;
};
};
};

stm: stm@10002000 {
Expand Down