Bjorn, On Wed, Aug 11, 2021 at 3:45 PM Doug Anderson <dianders@xxxxxxxxxxxx> wrote: > > Hi, > > On Wed, Aug 11, 2021 at 3:41 PM Stephen Boyd <swboyd@xxxxxxxxxxxx> wrote: > > > > This should be the dai for display port. Without this set properly we > > fail to get audio routed through external displays on trogdor. It looks > > like we picked up v4[1] of this patch when there was a v7[2]. The v7 > > patch still had the wrong sound-dai but at least we can fix all this up > > and audio works. > > > > Cc: Srinivasa Rao Mandadapu <srivasam@xxxxxxxxxxxxxxxx> > > Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx> > > Cc: Douglas Anderson <dianders@xxxxxxxxxxxx> > > Fixes: b22d313e1772 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI") > > Link: https://lore.kernel.org/r/20210721080549.28822-3-srivasam@xxxxxxxxxxxxxxxx [1] > > Link: https://lore.kernel.org/r/20210726120910.20335-3-srivasam@xxxxxxxxxxxxxx [2] > > Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx> > > --- > > > > Changes from v1: > > - Drop sound-dai-cells > > - Replace hdmi-primary with hdmi > > > > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > I'm no audio expert, but this matches v7 except for the bugfix setting > the ID for the `sound-dai` to be LPASS_DP_RX instead of 2, which > matches downstream. > > Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx> Since this is a "Fix" and it's my understanding that Fixes can be landed / pull requests sent for them anytime (regardless of the fact that it's currently -rc6) maybe it could still land without waiting for the merge window to start and end? -Doug