Skip to content

Commit 618b667

Browse files
xakep-amatopnashif
xakep-amatop
authored and
nashif
committed
boards: arm64: rcar: add board-specific configuration for MMC node
Add pin control group for UHS modes for H3ULCB, Salvator XS M3 boards to appropriate dts files. Both 'uhs' and 'default' pins states have the same properties for eMMC, e.g. 1.8V. Signed-off-by: Mykola Kvach <[email protected]>
1 parent b8f7fc3 commit 618b667

File tree

6 files changed

+138
-0
lines changed

6 files changed

+138
-0
lines changed

‎boards/renesas/rcar_h3ulcb/doc/rcar_h3ulcb_a57.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ hardware features:
5858
+-----------+------------------------------+--------------------------------+
5959
| UART | uart | serial port-polling |
6060
+-----------+------------------------------+--------------------------------+
61+
| MMC | renesas_rcar_mmc | DMA and SCC |
62+
+-----------+------------------------------+--------------------------------+
6163

6264
Other hardware features have not been enabled yet for this board.
6365

‎boards/renesas/rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57-pinctrl.dtsi‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,48 @@
1414
scif2_data_a_rx_default: scif2_data_a_rx_default {
1515
pin = <PIN_RX2_A FUNC_RX2_A>;
1616
};
17+
18+
emmc2_clk: emmc2_clk {
19+
pin = <PIN_SD2_CLK FUNC_SD2_CLK>;
20+
};
21+
22+
emmc2_cmd: emmc2_cmd {
23+
pin = <PIN_SD2_CMD FUNC_SD2_CMD>;
24+
};
25+
26+
emmc2_data0: emmc2_data0 {
27+
pin = <PIN_SD2_DATA0 FUNC_SD2_DAT0>;
28+
};
29+
30+
emmc2_data1: emmc2_data1 {
31+
pin = <PIN_SD2_DATA1 FUNC_SD2_DAT1>;
32+
};
33+
34+
emmc2_data2: emmc2_data2 {
35+
pin = <PIN_SD2_DATA2 FUNC_SD2_DAT2>;
36+
};
37+
38+
emmc2_data3: emmc2_data3 {
39+
pin = <PIN_SD2_DATA3 FUNC_SD2_DAT3>;
40+
};
41+
42+
emmc2_data4: emmc2_data4 {
43+
pin = <PIN_SD1_DATA0 FUNC_SD2_DAT4>;
44+
};
45+
46+
emmc2_data5: emmc2_data5 {
47+
pin = <PIN_SD1_DATA1 FUNC_SD2_DAT5>;
48+
};
49+
50+
emmc2_data6: emmc2_data6 {
51+
pin = <PIN_SD1_DATA2 FUNC_SD2_DAT6>;
52+
};
53+
54+
emmc2_data7: emmc2_data7 {
55+
pin = <PIN_SD1_DATA3 FUNC_SD2_DAT7>;
56+
};
57+
58+
emmc2_ds: emmc2_ds {
59+
pin = <PIN_SD2_DS FUNC_SD2_DS>;
60+
};
1761
};

‎boards/renesas/rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57.dts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,33 @@
2323
device_type = "mmio-sram";
2424
reg = <0x0 0x48000000 0x0 DT_SIZE_M(512)>;
2525
};
26+
27+
/* These aliases are provided for compatibility with samples */
28+
aliases {
29+
sdhc0 = &emmc2;
30+
};
2631
};
2732

2833
&scif2 {
2934
pinctrl-0 = <&scif2_data_a_tx_default &scif2_data_a_rx_default>;
3035
pinctrl-names = "default";
3136
status = "okay";
3237
};
38+
39+
&emmc2 {
40+
pinctrl-0 = <&emmc2_clk &emmc2_cmd &emmc2_ds
41+
&emmc2_data0 &emmc2_data1 &emmc2_data2 &emmc2_data3
42+
&emmc2_data4 &emmc2_data5 &emmc2_data6 &emmc2_data7>;
43+
pinctrl-1 = <&emmc2_clk &emmc2_cmd &emmc2_ds
44+
&emmc2_data0 &emmc2_data1 &emmc2_data2 &emmc2_data3
45+
&emmc2_data4 &emmc2_data5 &emmc2_data6 &emmc2_data7>;
46+
pinctrl-names = "default", "uhs";
47+
disk {
48+
compatible = "zephyr,mmc-disk";
49+
status = "disabled";
50+
};
51+
bus-width = <8>;
52+
mmc-hs200-1_8v;
53+
mmc-hs400-1_8v;
54+
non-removable;
55+
};

‎boards/renesas/rcar_salvator_xs/doc/index.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ hardware features:
4343
+-----------+------------------------------+--------------------------------+
4444
| UART | uart | serial port-polling |
4545
+-----------+------------------------------+--------------------------------+
46+
| MMC | renesas_rcar_mmc | DMA and SCC |
47+
+-----------+------------------------------+--------------------------------+
4648

4749
Other hardware features have not been enabled yet for this board.
4850

‎boards/renesas/rcar_salvator_xs/rcar_salvator_xs-pinctrl.dtsi‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,48 @@
1414
scif2_data_a_rx_default: scif2_data_a_rx_default {
1515
pin = <PIN_RX2_A FUNC_RX2_A>;
1616
};
17+
18+
emmc2_clk: emmc2_clk {
19+
pin = <PIN_SD2_CLK FUNC_SD2_CLK>;
20+
};
21+
22+
emmc2_cmd: emmc2_cmd {
23+
pin = <PIN_SD2_CMD FUNC_SD2_CMD>;
24+
};
25+
26+
emmc2_data0: emmc2_data0 {
27+
pin = <PIN_SD2_DATA0 FUNC_SD2_DAT0>;
28+
};
29+
30+
emmc2_data1: emmc2_data1 {
31+
pin = <PIN_SD2_DATA1 FUNC_SD2_DAT1>;
32+
};
33+
34+
emmc2_data2: emmc2_data2 {
35+
pin = <PIN_SD2_DATA2 FUNC_SD2_DAT2>;
36+
};
37+
38+
emmc2_data3: emmc2_data3 {
39+
pin = <PIN_SD2_DATA3 FUNC_SD2_DAT3>;
40+
};
41+
42+
emmc2_data4: emmc2_data4 {
43+
pin = <PIN_SD1_DATA0 FUNC_SD2_DAT4>;
44+
};
45+
46+
emmc2_data5: emmc2_data5 {
47+
pin = <PIN_SD1_DATA1 FUNC_SD2_DAT5>;
48+
};
49+
50+
emmc2_data6: emmc2_data6 {
51+
pin = <PIN_SD1_DATA2 FUNC_SD2_DAT6>;
52+
};
53+
54+
emmc2_data7: emmc2_data7 {
55+
pin = <PIN_SD1_DATA3 FUNC_SD2_DAT7>;
56+
};
57+
58+
emmc2_ds: emmc2_ds {
59+
pin = <PIN_SD2_DS FUNC_SD2_DS>;
60+
};
1761
};

‎boards/renesas/rcar_salvator_xs/rcar_salvator_xs.dts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
zephyr,shell-uart = &scif2;
2020
};
2121

22+
/* These aliases are provided for compatibility with samples */
23+
aliases {
24+
sdhc0 = &emmc2;
25+
};
26+
2227
ram: memory@48000000 {
2328
device_type = "mmio-sram";
2429
reg = <0x0 0x48000000 0x0 DT_SIZE_M(512)>;
@@ -30,3 +35,21 @@
3035
pinctrl-names = "default";
3136
status = "okay";
3237
};
38+
39+
&emmc2 {
40+
pinctrl-0 = <&emmc2_clk &emmc2_cmd &emmc2_ds
41+
&emmc2_data0 &emmc2_data1 &emmc2_data2 &emmc2_data3
42+
&emmc2_data4 &emmc2_data5 &emmc2_data6 &emmc2_data7>;
43+
pinctrl-1 = <&emmc2_clk &emmc2_cmd &emmc2_ds
44+
&emmc2_data0 &emmc2_data1 &emmc2_data2 &emmc2_data3
45+
&emmc2_data4 &emmc2_data5 &emmc2_data6 &emmc2_data7>;
46+
pinctrl-names = "default", "uhs";
47+
disk {
48+
compatible = "zephyr,mmc-disk";
49+
status = "disabled";
50+
};
51+
bus-width = <8>;
52+
mmc-hs200-1_8v;
53+
mmc-hs400-1_8v;
54+
non-removable;
55+
};

0 commit comments

Comments
 (0)