Skip to content

Commit ab3a124

Browse files
author
AngeloGioacchino Del Regno
committed
arm64: dts: mediatek: mt6795-xperia-m5: Add UHS pins for MMC1 and 2
Add the UHS state pins for the MMC1 and MMC2 controllers and, while at it, also add the correct drive strength parameters for the default pin states for those two. Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
1 parent 96cb8d6 commit ab3a124

1 file changed

Lines changed: 46 additions & 2 deletions

File tree

arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,19 @@
227227

228228
&mmc1 {
229229
/* MicroSD card slot */
230-
pinctrl-names = "default";
230+
pinctrl-names = "default", "state_uhs";
231231
pinctrl-0 = <&mmc1_pins_default>;
232+
pinctrl-1 = <&mmc1_pins_uhs>;
232233
vmmc-supply = <&mt6331_vmc_reg>;
233234
vqmmc-supply = <&mt6331_vmch_reg>;
234235
status = "okay";
235236
};
236237

237238
&mmc2 {
238239
/* SDIO WiFi on MMC2 */
239-
pinctrl-names = "default";
240+
pinctrl-names = "default", "state_uhs";
240241
pinctrl-0 = <&mmc2_pins_default>;
242+
pinctrl-1 = <&mmc2_pins_uhs>;
241243
vmmc-supply = <&mt6331_vmc_reg>;
242244
vqmmc-supply = <&mt6331_vmch_reg>;
243245
status = "okay";
@@ -324,11 +326,32 @@
324326
<PINMUX_GPIO170__FUNC_MSDC1_CMD>;
325327
input-enable;
326328
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
329+
drive-strength = <4>;
327330
};
328331

329332
pins-clk {
330333
pinmux = <PINMUX_GPIO175__FUNC_MSDC1_CLK>;
331334
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
335+
drive-strength = <4>;
336+
};
337+
};
338+
339+
mmc1_pins_uhs: microsd-uhs-pins {
340+
pins-cmd-dat {
341+
pinmux = <PINMUX_GPIO171__FUNC_MSDC1_DAT0>,
342+
<PINMUX_GPIO172__FUNC_MSDC1_DAT1>,
343+
<PINMUX_GPIO173__FUNC_MSDC1_DAT2>,
344+
<PINMUX_GPIO174__FUNC_MSDC1_DAT3>,
345+
<PINMUX_GPIO170__FUNC_MSDC1_CMD>;
346+
input-enable;
347+
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
348+
drive-strength = <6>;
349+
};
350+
351+
pins-clk {
352+
pinmux = <PINMUX_GPIO175__FUNC_MSDC1_CLK>;
353+
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
354+
drive-strength = <8>;
332355
};
333356
};
334357

@@ -341,11 +364,32 @@
341364
<PINMUX_GPIO105__FUNC_MSDC2_CMD>;
342365
input-enable;
343366
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
367+
drive-strength = <4>;
368+
};
369+
370+
pins-clk {
371+
pinmux = <PINMUX_GPIO104__FUNC_MSDC2_CLK>;
372+
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
373+
drive-strength = <4>;
374+
};
375+
};
376+
377+
mmc2_pins_uhs: sdio-uhs-pins {
378+
pins-cmd-dat {
379+
pinmux = <PINMUX_GPIO100__FUNC_MSDC2_DAT0>,
380+
<PINMUX_GPIO101__FUNC_MSDC2_DAT1>,
381+
<PINMUX_GPIO102__FUNC_MSDC2_DAT2>,
382+
<PINMUX_GPIO103__FUNC_MSDC2_DAT3>,
383+
<PINMUX_GPIO105__FUNC_MSDC2_CMD>;
384+
input-enable;
385+
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
386+
drive-strength = <8>;
344387
};
345388

346389
pins-clk {
347390
pinmux = <PINMUX_GPIO104__FUNC_MSDC2_CLK>;
348391
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
392+
drive-strength = <8>;
349393
};
350394
};
351395

0 commit comments

Comments
 (0)