Skip to content

L
linux
Commit fd6f2236 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: audio-graph-card2-custom-sample.dtsi: remove DT warning 

Current audio-graph-card2-custom-sample.dtsi is missing
address-cells / size-cells / reg. Thus it get too many DT warnings.
This patch solved it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a5x5qw3d.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 947e3960
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 50 deletions
sound/soc/generic/audio-graph-card2-custom-sample.dtsi
View file @ fd6f2236
...@@ -172,83 +172,127 @@ &c2c_m ...@@ -172,83 +172,127 @@ &c2c_m
>; >;
multi { multi {
#address-cells = <1>;
#size-cells = <0>;
ports@0 { ports@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
/* [Multi-CPU] */ /* [Multi-CPU] */
mcpu0: port@0 { mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; mcpu0: port@0 { reg = <0>; mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; };
port@1 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; port@1 { reg = <1>; mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; };
port@2 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; port@2 { reg = <2>; mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; };
}; };
/* [Multi-Codec] */ /* [Multi-Codec] */
ports@1 { ports@1 {
port@0 { mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; reg = <1>;
port@1 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; #address-cells = <1>;
port@2 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; #size-cells = <0>;
port@0 { reg = <0>; mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; };
port@1 { reg = <1>; mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; };
port@2 { reg = <2>; mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; };
}; };
/* [DPCM-Multi]::BE */ /* [DPCM-Multi]::BE */
ports@2 { ports@2 {
port@0 { mbe_ep: endpoint { remote-endpoint = <&be10_ep>; }; }; reg = <2>;
port@1 { mbe1_ep: endpoint { remote-endpoint = <&codec4_ep>; }; }; #address-cells = <1>;
port@2 { mbe2_ep: endpoint { remote-endpoint = <&codec5_ep>; }; }; #size-cells = <0>;
port@0 { reg = <0>; mbe_ep: endpoint { remote-endpoint = <&be10_ep>; }; };
port@1 { reg = <1>; mbe1_ep: endpoint { remote-endpoint = <&codec4_ep>; }; };
port@2 { reg = <2>; mbe2_ep: endpoint { remote-endpoint = <&codec5_ep>; }; };
}; };
/* [Codec2Codec-Multi]::CPU */ /* [Codec2Codec-Multi]::CPU */
ports@3 { ports@3 {
port@0 { mc2c0_ep: endpoint { remote-endpoint = <&c2cmf_ep>; }; }; reg = <3>;
port@1 { mc2c00_ep: endpoint { remote-endpoint = <&codec8_ep>; }; }; #address-cells = <1>;
port@2 { mc2c01_ep: endpoint { remote-endpoint = <&codec9_ep>; }; }; #size-cells = <0>;
port@0 { reg = <0>; mc2c0_ep: endpoint { remote-endpoint = <&c2cmf_ep>; }; };
port@1 { reg = <1>; mc2c00_ep: endpoint { remote-endpoint = <&codec8_ep>; }; };
port@2 { reg = <2>; mc2c01_ep: endpoint { remote-endpoint = <&codec9_ep>; }; };
}; };
/* [Codec2Codec-Multi]::Codec */ /* [Codec2Codec-Multi]::Codec */
ports@4 { ports@4 {
port@0 { mc2c1_ep: endpoint { remote-endpoint = <&c2cmb_ep>; }; }; reg = <4>;
port@1 { mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; }; #address-cells = <1>;
port@2 { mc2c11_ep: endpoint { remote-endpoint = <&codec11_ep>; }; }; #size-cells = <0>;
port@0 { reg = <0>; mc2c1_ep: endpoint { remote-endpoint = <&c2cmb_ep>; }; };
port@1 { reg = <1>; mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; };
port@2 { reg = <2>; mc2c11_ep: endpoint { remote-endpoint = <&codec11_ep>; }; };
}; };
/* [Semi-Multi] */ /* [Semi-Multi] */
ports@5 { ports@5 {
port@0 { smcodec0_ep: endpoint { remote-endpoint = <&cpu7_ep>; }; }; reg = <5>;
port@1 { smcodec1_ep: endpoint { remote-endpoint = <&codec12_ep>; }; }; #address-cells = <1>;
port@2 { smcodec2_ep: endpoint { remote-endpoint = <&codec13_ep>; }; }; #size-cells = <0>;
port@0 { reg = <0>; smcodec0_ep: endpoint { remote-endpoint = <&cpu7_ep>; }; };
port@1 { reg = <1>; smcodec1_ep: endpoint { remote-endpoint = <&codec12_ep>; }; };
port@2 { reg = <2>; smcodec2_ep: endpoint { remote-endpoint = <&codec13_ep>; }; };
}; };
}; };
dpcm { dpcm {
#address-cells = <1>;
#size-cells = <0>;
ports@0 { ports@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
/* [DPCM]::FE */ /* [DPCM]::FE */
fe00: port@0 { fe00_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; }; fe00: port@0 { reg = <0>; fe00_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; };
fe01: port@1 { fe01_ep: endpoint { remote-endpoint = <&cpu4_ep>; }; }; fe01: port@1 { reg = <1>; fe01_ep: endpoint { remote-endpoint = <&cpu4_ep>; }; };
/* [DPCM-Multi]::FE */ /* [DPCM-Multi]::FE */
fe10: port@2 { fe10_ep: endpoint { remote-endpoint = <&cpu5_ep>; }; }; fe10: port@2 { reg = <2>; fe10_ep: endpoint { remote-endpoint = <&cpu5_ep>; }; };
fe11: port@3 { fe11_ep: endpoint { remote-endpoint = <&cpu6_ep>; }; }; fe11: port@3 { reg = <3>; fe11_ep: endpoint { remote-endpoint = <&cpu6_ep>; }; };
}; };
ports@1 { ports@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
/* [DPCM]::BE */ /* [DPCM]::BE */
be0: port@0 { be00_ep: endpoint { remote-endpoint = <&codec3_ep>; }; }; be0: port@0 { reg = <0>; be00_ep: endpoint { remote-endpoint = <&codec3_ep>; }; };
/* [DPCM-Multi]::BE */ /* [DPCM-Multi]::BE */
be1: port@1 { be10_ep: endpoint { remote-endpoint = <&mbe_ep>; }; }; be1: port@1 { reg = <1>; be10_ep: endpoint { remote-endpoint = <&mbe_ep>; }; };
}; };
}; };
codec2codec { codec2codec {
#address-cells = <1>;
#size-cells = <0>;
/* [Codec2Codec] */ /* [Codec2Codec] */
ports@0 { ports@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
/* use default settings */ /* use default settings */
c2c: port@0 { c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; c2c: port@0 { reg = <0>; c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; };
port@1 { c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; }; port@1 { reg = <1>; c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; };
}; };
/* [Codec2Codec-Multi] */ /* [Codec2Codec-Multi] */
ports@1 { ports@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
/* use original settings */ /* use original settings */
rate = <48000>; rate = <48000>;
c2c_m: port@0 { c2cmf_ep: endpoint { remote-endpoint = <&mc2c0_ep>; }; }; c2c_m: port@0 { reg = <0>; c2cmf_ep: endpoint { remote-endpoint = <&mc2c0_ep>; }; };
port@1 { c2cmb_ep: endpoint { remote-endpoint = <&mc2c1_ep>; }; }; port@1 { reg = <1>; c2cmb_ep: endpoint { remote-endpoint = <&mc2c1_ep>; }; };
}; };
}; };
}; };
...@@ -264,25 +308,28 @@ test_cpu { ...@@ -264,25 +308,28 @@ test_cpu {
*/ */
compatible = "test-cpu"; compatible = "test-cpu";
ports { ports {
#address-cells = <1>;
#size-cells = <0>;
bitclock-master; bitclock-master;
frame-master; frame-master;
/* [Normal] */ /* [Normal] */
cpu0: port@0 { cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; cpu0: port@0 { reg = <0>; cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; };
/* [Multi-CPU] */ /* [Multi-CPU] */
port@1 { cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; port@1 { reg = <1>; cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; };
port@2 { cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; port@2 { reg = <2>; cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; };
/* [DPCM]::FE */ /* [DPCM]::FE */
port@3 { cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; }; port@3 { reg = <3>; cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; };
port@4 { cpu4_ep: endpoint { remote-endpoint = <&fe01_ep>; }; }; port@4 { reg = <4>; cpu4_ep: endpoint { remote-endpoint = <&fe01_ep>; }; };
/* [DPCM-Multi]::FE */ /* [DPCM-Multi]::FE */
port@5 { cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; }; port@5 { reg = <5>; cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; };
port@6 { cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; }; port@6 { reg = <6>; cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; };
/* [Semi-Multi] */ /* [Semi-Multi] */
sm0: port@7 { cpu7_ep: endpoint { remote-endpoint = <&smcodec0_ep>; }; }; sm0: port@7 { reg = <7>; cpu7_ep: endpoint { remote-endpoint = <&smcodec0_ep>; }; };
}; };
}; };
...@@ -297,6 +344,9 @@ test_codec { ...@@ -297,6 +344,9 @@ test_codec {
*/ */
compatible = "test-codec"; compatible = "test-codec";
ports { ports {
#address-cells = <1>;
#size-cells = <0>;
/* /*
* prefix can be added to *component*, * prefix can be added to *component*,
* see audio-graph-card2::routing * see audio-graph-card2::routing
...@@ -304,39 +354,40 @@ ports { ...@@ -304,39 +354,40 @@ ports {
prefix = "TC"; prefix = "TC";
/* [Normal] */ /* [Normal] */
port@0 { codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; port@0 { reg = <0>; codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; };
/* [Multi-Codec] */ /* [Multi-Codec] */
port@1 { codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; port@1 { reg = <1>; codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; };
port@2 { codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; port@2 { reg = <2>; codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; };
/* [DPCM]::BE */ /* [DPCM]::BE */
port@3 { port@3 {
convert-rate = <44100>; convert-rate = <44100>;
codec3_ep: endpoint { remote-endpoint = <&be00_ep>; }; reg = <3>; codec3_ep: endpoint { remote-endpoint = <&be00_ep>; };
}; };
/* [DPCM-Multi]::BE */ /* [DPCM-Multi]::BE */
port@4 { codec4_ep: endpoint { remote-endpoint = <&mbe1_ep>; }; }; port@4 { reg = <4>; codec4_ep: endpoint { remote-endpoint = <&mbe1_ep>; }; };
port@5 { codec5_ep: endpoint { remote-endpoint = <&mbe2_ep>; }; }; port@5 { reg = <5>; codec5_ep: endpoint { remote-endpoint = <&mbe2_ep>; }; };
/* [Codec2Codec] */ /* [Codec2Codec] */
port@6 { bitclock-master; port@6 { bitclock-master;
frame-master; frame-master;
codec6_ep: endpoint { remote-endpoint = <&c2cf_ep>; }; }; reg = <6>; codec6_ep: endpoint { remote-endpoint = <&c2cf_ep>; }; };
port@7 { codec7_ep: endpoint { remote-endpoint = <&c2cb_ep>; }; }; port@7 { reg = <7>; codec7_ep: endpoint { remote-endpoint = <&c2cb_ep>; }; };
/* [Codec2Codec-Multi] */ /* [Codec2Codec-Multi] */
port@8 { bitclock-master; port@8 { bitclock-master;
frame-master; frame-master;
codec8_ep: endpoint { remote-endpoint = <&mc2c00_ep>; }; }; reg = <8>; codec8_ep: endpoint { remote-endpoint = <&mc2c00_ep>; }; };
port@9 { codec9_ep: endpoint { remote-endpoint = <&mc2c01_ep>; }; }; port@9 { reg = <9>; codec9_ep: endpoint { remote-endpoint = <&mc2c01_ep>; }; };
port@10 { codec10_ep: endpoint { remote-endpoint = <&mc2c10_ep>; }; }; port@a { reg = <10>; codec10_ep: endpoint { remote-endpoint = <&mc2c10_ep>; }; };
port@11 { codec11_ep: endpoint { remote-endpoint = <&mc2c11_ep>; }; }; port@b { reg = <11>; codec11_ep: endpoint { remote-endpoint = <&mc2c11_ep>; }; };
/* [Semi-Multi] */ /* [Semi-Multi] */
port@12 { codec12_ep: endpoint { remote-endpoint = <&smcodec1_ep>; }; }; port@c { reg = <12>; codec12_ep: endpoint { remote-endpoint = <&smcodec1_ep>; }; };
port@13 { codec13_ep: endpoint { remote-endpoint = <&smcodec2_ep>; }; }; port@d { reg = <13>; codec13_ep: endpoint { remote-endpoint = <&smcodec2_ep>; }; };
}; };
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7