Skip to content

Commit c83e095

Browse files
konradybcioandersson
authored andcommitted
arm64: dts: qcom: msm8992: Fix SDHCI1
This commit ensures the correct IRQ type is set and disables the device by default. The mmc-hs400-1_8v property is also moved to Bullhead as it might not be present on all boards. The node has been renamed to sdhci@ instead of mmc@ and the phandle was changed to sdhc_1 to comply with the newer DTS style. Signed-off-by: Konrad Dybcio <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent d99c1c2 commit c83e095

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,9 @@
271271
};
272272
};
273273
};
274+
275+
&sdhc_1 {
276+
status = "okay";
277+
278+
mmc-hs400-1_8v;
279+
};

arch/arm64/boot/dts/qcom/msm8992.dtsi

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,19 @@
158158
};
159159
};
160160

161-
sdhci1: mmc@f9824900 {
161+
sdhc_1: sdhci@f9824900 {
162162
compatible = "qcom,sdhci-msm-v4";
163163
reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>;
164164
reg-names = "hc_mem", "core_mem";
165165

166-
interrupts = <GIC_SPI 123 IRQ_TYPE_NONE>,
167-
<GIC_SPI 138 IRQ_TYPE_NONE>;
166+
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
167+
<GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
168168
interrupt-names = "hc_irq", "pwr_irq";
169169

170170
clocks = <&gcc GCC_SDCC1_APPS_CLK>,
171-
<&gcc GCC_SDCC1_AHB_CLK>;
172-
clock-names = "core", "iface";
171+
<&gcc GCC_SDCC1_AHB_CLK>,
172+
<&xo_board>;
173+
clock-names = "core", "iface", "xo";
173174

174175
pinctrl-names = "default", "sleep";
175176
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
@@ -179,8 +180,9 @@
179180

180181
regulator-always-on;
181182
bus-width = <8>;
182-
mmc-hs400-1_8v;
183-
status = "okay";
183+
non-removable;
184+
185+
status = "disabled";
184186
};
185187

186188
blsp1_uart2: serial@f991e000 {

0 commit comments

Comments
 (0)