Hi Judy, this patch needs a re-spin to fix a conflict after Add new board revision and LTE SKUs for sc7280-villager family https://patchwork.kernel.org/project/linux-arm-msm/list/?series=663014 landed. Thanks Matthias On Wed, May 25, 2022 at 01:43:08AM +0000, Judy Hsiao wrote: > Include sc7280-herobrine-audio-rt5682.dtsi in villager and herobrine-r1 as > these boards use rt5682 codec. > > Signed-off-by: Judy Hsiao <judyhsiao@xxxxxxxxxxxx> > Reviewed-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx> > Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx> > Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx> > --- > arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + > arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts > index b69ca09d9bfb..f68d28f8701b 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts > @@ -8,6 +8,7 @@ > /dts-v1/; > > #include "sc7280-herobrine.dtsi" > +#include "sc7280-herobrine-audio-rt5682.dtsi" > > / { > model = "Google Herobrine (rev1+)"; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts > index d3d6ffad4eff..7a4acd3b9ee3 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts > @@ -8,6 +8,7 @@ > /dts-v1/; > > #include "sc7280-herobrine.dtsi" > +#include "sc7280-herobrine-audio-rt5682.dtsi" > > / { > model = "Google Villager (rev0+)";
