hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/arch/arm64/boot/dts/renesas/ulcb.dtsi
....@@ -6,6 +6,14 @@
66 * Copyright (C) 2016 Cogent Embedded, Inc.
77 */
88
9
+/*
10
+ * SSI-AK4613
11
+ * aplay -D plughw:0,0 xxx.wav
12
+ * arecord -D plughw:0,0 xxx.wav
13
+ * SSI-HDMI
14
+ * aplay -D plughw:0,1 xxx.wav
15
+ */
16
+
917 #include <dt-bindings/gpio/gpio.h>
1018 #include <dt-bindings/input/input.h>
1119
....@@ -15,9 +23,12 @@
1523 aliases {
1624 serial0 = &scif2;
1725 ethernet0 = &avb;
26
+ mmc0 = &sdhi2;
27
+ mmc1 = &sdhi0;
1828 };
1929
2030 chosen {
31
+ bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
2132 stdout-path = "serial0:115200n8";
2233 };
2334
....@@ -82,20 +93,13 @@
8293 regulator-always-on;
8394 };
8495
85
- rsnd_ak4613: sound {
86
- compatible = "simple-audio-card";
96
+ sound_card: sound {
97
+ compatible = "audio-graph-card";
98
+ label = "rcar-sound";
8799
88
- simple-audio-card,format = "left_j";
89
- simple-audio-card,bitclock-master = <&sndcpu>;
90
- simple-audio-card,frame-master = <&sndcpu>;
91
-
92
- sndcpu: simple-audio-card,cpu {
93
- sound-dai = <&rcar_sound>;
94
- };
95
-
96
- sndcodec: simple-audio-card,codec {
97
- sound-dai = <&ak4613>;
98
- };
100
+ dais = <&rsnd_port0 /* ak4613 */
101
+ &rsnd_port1 /* HDMI0 */
102
+ >;
99103 };
100104
101105 vcc_sdhi0: regulator-vcc-sdhi0 {
....@@ -118,8 +122,7 @@
118122
119123 gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
120124 gpios-states = <1>;
121
- states = <3300000 1
122
- 1800000 0>;
125
+ states = <3300000 1>, <1800000 0>;
123126 };
124127
125128 x12_clk: x12 {
....@@ -181,6 +184,12 @@
181184 remote-endpoint = <&hdmi0_con>;
182185 };
183186 };
187
+ port@2 {
188
+ reg = <2>;
189
+ dw_hdmi0_snd_in: endpoint {
190
+ remote-endpoint = <&rsnd_for_hdmi>;
191
+ };
192
+ };
184193 };
185194 };
186195
....@@ -210,6 +219,12 @@
210219 asahi-kasei,out4-single-end;
211220 asahi-kasei,out5-single-end;
212221 asahi-kasei,out6-single-end;
222
+
223
+ port {
224
+ ak4613_endpoint: endpoint {
225
+ remote-endpoint = <&rsnd_for_ak4613>;
226
+ };
227
+ };
213228 };
214229
215230 cs2000: clk-multiplier@4f {
....@@ -240,6 +255,8 @@
240255
241256 &i2c_dvfs {
242257 status = "okay";
258
+
259
+ clock-frequency = <400000>;
243260
244261 pmic: pmic@30 {
245262 pinctrl-0 = <&irq0_pins>;
....@@ -329,12 +346,6 @@
329346 sdhi2_pins: sd2 {
330347 groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
331348 function = "sdhi2";
332
- power-source = <3300>;
333
- };
334
-
335
- sdhi2_pins_uhs: sd2_uhs {
336
- groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
337
- function = "sdhi2";
338349 power-source = <1800>;
339350 };
340351
....@@ -387,12 +398,40 @@
387398 <&audio_clk_c>,
388399 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
389400
390
- rcar_sound,dai {
391
- dai0 {
392
- playback = <&ssi0 &src0 &dvc0>;
393
- capture = <&ssi1 &src1 &dvc1>;
401
+ ports {
402
+ #address-cells = <1>;
403
+ #size-cells = <0>;
404
+ rsnd_port0: port@0 {
405
+ reg = <0>;
406
+ rsnd_for_ak4613: endpoint {
407
+ remote-endpoint = <&ak4613_endpoint>;
408
+
409
+ dai-format = "left_j";
410
+ bitclock-master = <&rsnd_for_ak4613>;
411
+ frame-master = <&rsnd_for_ak4613>;
412
+
413
+ playback = <&ssi0 &src0 &dvc0>;
414
+ capture = <&ssi1 &src1 &dvc1>;
415
+ };
416
+ };
417
+ rsnd_port1: port@1 {
418
+ reg = <1>;
419
+ rsnd_for_hdmi: endpoint {
420
+ remote-endpoint = <&dw_hdmi0_snd_in>;
421
+
422
+ dai-format = "i2s";
423
+ bitclock-master = <&rsnd_for_hdmi>;
424
+ frame-master = <&rsnd_for_hdmi>;
425
+
426
+ playback = <&ssi2>;
427
+ };
394428 };
395429 };
430
+};
431
+
432
+&rwdt {
433
+ timeout-sec = <60>;
434
+ status = "okay";
396435 };
397436
398437 &scif2 {
....@@ -416,19 +455,21 @@
416455 cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
417456 bus-width = <4>;
418457 sd-uhs-sdr50;
458
+ sd-uhs-sdr104;
419459 status = "okay";
420460 };
421461
422462 &sdhi2 {
423463 /* used for on-board 8bit eMMC */
424464 pinctrl-0 = <&sdhi2_pins>;
425
- pinctrl-1 = <&sdhi2_pins_uhs>;
465
+ pinctrl-1 = <&sdhi2_pins>;
426466 pinctrl-names = "default", "state_uhs";
427467
428468 vmmc-supply = <&reg_3p3v>;
429469 vqmmc-supply = <&reg_1p8v>;
430470 bus-width = <8>;
431471 mmc-hs200-1_8v;
472
+ mmc-hs400-1_8v;
432473 non-removable;
433474 full-pwr-cycle-in-suspend;
434475 status = "okay";
....@@ -442,10 +483,5 @@
442483 pinctrl-0 = <&usb1_pins>;
443484 pinctrl-names = "default";
444485
445
- status = "okay";
446
-};
447
-
448
-&rwdt {
449
- timeout-sec = <60>;
450486 status = "okay";
451487 };