]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
ASoC: simple-card: Restore original configuration of DAI format
authorJon Hunter <jonathanh@nvidia.com>
Fri, 24 May 2019 08:54:04 +0000 (09:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 May 2019 12:10:33 +0000 (13:10 +0100)
commit4819d06292c9b57eabdd6d1603e49a27baf183be
tree7b3e4dc42fbfb102018806bb5aaea4b83962a26e
parentdf9366131a452296d040a7a496d93108f1fc240c
ASoC: simple-card: Restore original configuration of DAI format

Revert commit 069d037aea98 ("ASoC: simple-card: Fix configuration of
DAI format"). During further review, it turns out that the actual issue
was caused by an incorrectly formatted device-tree node describing the
soundcard.

The following is incorrect because the simple-audio-card
'bitclock-master' and 'frame-master' properties should not reference the
actual codec phandle ...

sound {
compatible = "simple-audio-card";
...
=> simple-audio-card,bitclock-master = <&codec>;
=> simple-audio-card,frame-master = <&codec>;
...

simple-audio-card,cpu {
sound-dai = <&xxx>;
};

simple-audio-card,codec {
=> sound-dai = <&codec>;
};
};

Rather, these properties should reference the phandle to the
'simple-audio-card,codec' property as shown below ...

sound {
compatible = "simple-audio-card";
...
=> simple-audio-card,bitclock-master = <&codec>;
=> simple-audio-card,frame-master = <&codec>;
...

simple-audio-card,cpu {
sound-dai = <&xxx>;
};

=> codec: simple-audio-card,codec { /* simple-card wants here */
sound-dai = <&xxx>;  /* not here */
};
};

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card.c