diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-10 16:06:46 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-10 16:06:46 +0100 |
commit | 1c62ec5f1a0f9330c251433e6290e9441c7326b9 (patch) | |
tree | a9be824a6ba1f61f3d0b87b64ea74d264e3e304b /sound/soc/rockchip | |
parent | 3689eb0bbd52774e153fd7bdc5a90dbbf8cf8996 (diff) | |
parent | e25f8afd8869bd97a4d0baea5d8da730913c8541 (diff) | |
download | linux-1c62ec5f1a0f9330c251433e6290e9441c7326b9.tar.bz2 |
Merge series "ASoC: mediatek: mt8183: support DP audio" from Tzung-Bi Shih <tzungbi@google.com>:
This series is a follow up for a long time ago series
(https://patchwork.kernel.org/cover/11204303/).
The old series bound too much on the patches of DRM bridge and ASoC
machine driver. And unluckily, the dependencies
(https://lore.kernel.org/patchwork/patch/1126819/) have not applied.
Revewing the ASoC patches in the old series, I found that they could be
decoupled from the DRM bridge patches. And they are harmless as it is
an optional attribute ("hdmi-codec") in DTS.
This series arranges and rebases the harmless ASoC patches for
mt8183-mt6358-ts3a227-max98357 and mt8183-da7219-max98357.
The 1st and 4th patch add an optional DT property. The 1st patch was
acked long time ago (https://patchwork.kernel.org/patch/11204321/).
The 2nd and 5th patch add DAI link for using hdmi-codec.
The 3rd and 6th patch support the HDMI jack reporting.
Tzung-Bi Shih (6):
ASoC: dt-bindings: mt8183: add a property "mediatek,hdmi-codec"
ASoC: mediatek: mt8183: use hdmi-codec
ASoC: mediatek: mt8183: support HDMI jack reporting
ASoC: dt-bindings: mt8183-da7219: add a property "mediatek,hdmi-codec"
ASoC: mediatek: mt8183-da7219: use hdmi-codec
ASoC: mediatek: mt8183-da7219: support HDMI jack reporting
.../bindings/sound/mt8183-da7219-max98357.txt | 4 +++
.../sound/mt8183-mt6358-ts3a227-max98357.txt | 2 ++
sound/soc/mediatek/Kconfig | 2 ++
.../mediatek/mt8183/mt8183-da7219-max98357.c | 29 +++++++++++++++++--
.../mt8183/mt8183-mt6358-ts3a227-max98357.c | 29 +++++++++++++++++--
5 files changed, 60 insertions(+), 6 deletions(-)
--
2.27.0.383.g050319c2ae-goog
Diffstat (limited to 'sound/soc/rockchip')
0 files changed, 0 insertions, 0 deletions