Skip to content
Open
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
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "shikra-cqm-som.dtsi"
#include "shikra-evk.dtsi"
#include <dt-bindings/gpio/gpio.h>

/ {
model = "Qualcomm Technologies, Inc. Shikra CQM EVK";
Expand All @@ -15,6 +16,7 @@

aliases {
mmc0 = &sdhc_1;
mmc1 = &sdhc_2; /* SDC2 SD card slot */
serial0 = &uart0;
serial1 = &uart8;
};
Expand Down Expand Up @@ -59,6 +61,22 @@
status = "okay";
};

&sdhc_2 {
vmmc-supply = <&pm4125_l21>;
vqmmc-supply = <&pm4125_l4>;

no-sdio;
no-mmc;

pinctrl-0 = <&sdc2_default &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_sleep &sdc2_card_det_n>;
pinctrl-names = "default", "sleep";

cd-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>;

status = "okay";
};

&uart8 {
status = "okay";

Expand Down
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "shikra-cqm-som.dtsi"
#include "shikra-evk.dtsi"
#include <dt-bindings/gpio/gpio.h>

/ {
model = "Qualcomm Technologies, Inc. Shikra CQS EVK";
Expand All @@ -15,6 +16,7 @@

aliases {
mmc0 = &sdhc_1;
mmc1 = &sdhc_2; /* SDC2 SD card slot */
serial0 = &uart0;
serial1 = &uart8;
};
Expand Down Expand Up @@ -59,6 +61,22 @@
status = "okay";
};

&sdhc_2 {
vmmc-supply = <&pm4125_l21>;
vqmmc-supply = <&pm4125_l4>;

no-sdio;
no-mmc;

pinctrl-0 = <&sdc2_default &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_sleep &sdc2_card_det_n>;
pinctrl-names = "default", "sleep";

cd-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>;

status = "okay";
};

&uart8 {
status = "okay";

Expand Down
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "shikra-iqs-som.dtsi"
#include "shikra-evk.dtsi"
#include <dt-bindings/gpio/gpio.h>

/ {
model = "Qualcomm Technologies, Inc. Shikra IQS EVK";
Expand All @@ -15,6 +16,7 @@

aliases {
mmc0 = &sdhc_1;
mmc1 = &sdhc_2; /* SDC2 SD card slot */
serial0 = &uart0;
serial1 = &uart8;
};
Expand Down Expand Up @@ -75,6 +77,22 @@
status = "okay";
};

&sdhc_2 {
vmmc-supply = <&pm8150_l10>;
vqmmc-supply = <&pm8150_l2>;

no-sdio;
no-mmc;

pinctrl-0 = <&sdc2_default &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_sleep &sdc2_card_det_n>;
pinctrl-names = "default", "sleep";

cd-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>;

status = "okay";
};

&uart8 {
status = "okay";

Expand Down
93 changes: 93 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,53 @@
bias-bus-hold;
};
};

sdc2_default: sdc2-default-state {
clk-pins {
pins = "sdc2_clk";
drive-strength = <14>;
bias-disable;
};

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

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

sdc2_sleep: 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;
};
};

sdc2_card_det_n: sd-card-det-n-state {
pins = "gpio89";
function = "gpio";
drive-strength = <2>;
bias-pull-up;
};
};

pmu@c91000 {
Expand Down Expand Up @@ -1119,6 +1166,52 @@
};
};

sdhc_2: mmc@4784000 {
compatible = "qcom,shikra-sdhci", "qcom,sdhci-msm-v5";
reg = <0x0 0x4784000 0x0 0x1000>;

interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "hc_irq", "pwr_irq";

bus-width = <4>;

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

qcom,dll-config = <0x0007442c>;
qcom,ddr-config = <0x80040868>;

iommus = <&apps_smmu 0x0a0 0x0>;

interconnects = <&system_noc MASTER_SDCC_2 RPM_ALWAYS_TAG
&mc_virt SLAVE_EBI_CH0 RPM_ALWAYS_TAG>,
<&mem_noc MASTER_AMPSS_M0 RPM_ACTIVE_TAG
&config_noc SLAVE_SDCC_2 RPM_ACTIVE_TAG>;
interconnect-names = "sdhc-ddr","cpu-sdhc";

power-domains = <&rpmpd RPMPD_VDDCX>;
operating-points-v2 = <&sdhc2_opp_table>;

status = "disabled";

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

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

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

sdhc_ice: crypto@4748000 {
compatible = "qcom,shikra-inline-crypto-engine",
"qcom,inline-crypto-engine";
Expand Down