| Message ID | 20170318075509.3836-6-mylene.josserand@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: > The digital AIF interfaces has been renamed in the sun8i audio codec > driver so the audio-routing in the device tree must be renamed too. Given that these are fixes it probably makes sense that they all go in together, can I get some acks for this and I'll apply it?
On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: >> The digital AIF interfaces has been renamed in the sun8i audio codec >> driver so the audio-routing in the device tree must be renamed too. > > Given that these are fixes it probably makes sense that they all go in > together, can I get some acks for this and I'll apply it? Acked-by: Chen-Yu Tsai <wens@csie.org> Though this patch should go in through the arm-soc tree.
On Mon, Mar 20, 2017 at 07:53:37PM +0800, Chen-Yu Tsai wrote: > On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > > Given that these are fixes it probably makes sense that they all go in > > together, can I get some acks for this and I'll apply it? > Acked-by: Chen-Yu Tsai <wens@csie.org> > Though this patch should go in through the arm-soc tree. Well, ideally but I'm not sure it's a super big deal to get the odd bit coming through so long as it doesn't conflict, it's more of a big deal to make sure that we don't get the ASoC side without the DT side and vice versa.
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -113,8 +113,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu {
The digital AIF interfaces has been renamed in the sun8i audio codec driver so the audio-routing in the device tree must be renamed too. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)