From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C922CC43381 for ; Mon, 25 Feb 2019 11:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FADE2087C for ; Mon, 25 Feb 2019 11:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbfBYLOz (ORCPT ); Mon, 25 Feb 2019 06:14:55 -0500 Received: from mx2.suse.de ([195.135.220.15]:57684 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726766AbfBYLOz (ORCPT ); Mon, 25 Feb 2019 06:14:55 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BC062AAA9; Mon, 25 Feb 2019 11:14:53 +0000 (UTC) Date: Mon, 25 Feb 2019 12:14:53 +0100 Message-ID: From: Takashi Iwai To: Arnd Bergmann Cc: Stephen Rothwell , Olof Johansson , ARM , Linux Next Mailing List , Linux Kernel Mailing List , Sameer Pujar , Thierry Reding , Mark Brown , Liam Girdwood Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree In-Reply-To: References: <20190225123615.49bce7cd@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 25 Feb 2019 10:19:15 +0100, Arnd Bergmann wrote: > > On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell wrote: > > > > Hi Takashi, > > > > Today's linux-next merge of the sound tree got conflicts in: > > > > arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts > > arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi > > > > between commits: > > > > 5eef17ee764d ("arm64: tegra: p2972: Sort nodes properly") > > be4f0dd347ad ("arm64: tegra: p2597: Sort nodes by unit-address") > > > > from the arm-soc tree and commit: > > > > 11ce4308307c ("arm64: tegra: custom name for hda sound card") > > > > from the sound tree. > > > > I fixed it up (see below - in tegra194-p2972-0000.dts. the line added > > just needed to be moved up a few lines) and can carry the fix as > > necessary. This is now fixed as far as linux-next is concerned, but any > > non trivial conflicts should be mentioned to your upstream maintainer > > when your tree is submitted for merging. You may also want to consider > > cooperating with the maintainer of the conflicting tree to minimise any > > particularly complex conflicts. > > The merge looks fine to me, but I wonder about that commit > in the alsa tree, why does the sound card need a board specific > name? > > I see this property being used in commit c0bde003a013 ("ALSA: > hda/tegra: sound card name from device tree"), which removes > a questionable use of the root compatible property, replacing > it with the new 'nvidia,model' property. We don't do this for any > other subsystem, so why does the sound subsystem export > information about the board as a string here? The sound subsystem exports merely some understandable name string for the given sound card object, and that was composed from the compatible string in the past, which turned out to be useless on some configs. But this kind of addition is an extremely bad manner, I'm fine to revert these (at best with a better alternative). This isn't about any functionality but rather some readable information that isn't a part of API. thanks, Takashi