Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 16 Feb 2022 15:41:46 +0100
Message-ID: <s5h4k4yan6d.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Thierry Reding <thierry.reding@gmail.com>
Cc:     Mohan Kumar <mkumard@nvidia.com>, broonie@kernel.org,
        lgirdwood@gmail.com, robh+dt@kernel.org, tiwai@suse.com,
        jonathanh@nvidia.com, spujar@nvidia.com,
        alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
        linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 0/6] Add Tegra234 HDA support
In-Reply-To: <Yg0I312RA5gh1Rra@orome>
References: <20220210065057.13555-1-mkumard@nvidia.com>
        <s5hmtiscl65.wl-tiwai@suse.de>
        <s5hk0dwckza.wl-tiwai@suse.de>
        <Yg0I312RA5gh1Rra@orome>
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
Precedence: bulk

On Wed, 16 Feb 2022 15:23:27 +0100,
Thierry Reding wrote:
> 
> On Tue, Feb 15, 2022 at 02:34:01PM +0100, Takashi Iwai wrote:
> > On Tue, 15 Feb 2022 14:29:54 +0100,
> > Takashi Iwai wrote:
> > > 
> > > On Thu, 10 Feb 2022 07:50:51 +0100,
> > > Mohan Kumar wrote:
> > > > 
> > > > This series add the support for TEGRA234 HDA driver support
> > > > 
> > > > Mohan Kumar (6):
> > > >   ALSA: hda/tegra: Add Tegra234 hda driver support
> > > >   ALSA: hda/tegra: Hardcode GCAP ISS value on T234
> > > >   ALSA: hda/tegra: Update scratch reg. communication
> > > >   dt-bindings: Add HDA support for Tegra234
> > > >   dt-bindings: Document Tegra234 HDA support
> > > >   arm64: tegra: Add hda dts node for Tegra234
> > > 
> > > Applied all six patches to for-next branch now.
> > 
> > ... and now I realized that it's conflicting with the latest Tegra234
> > reset stuff on linux-next.
> > 
> > Maybe better to split the patches to be merged through several trees?
> 
> It's usually best for me to pick up at least the DT changes (patch 6)
> into the Tegra tree, that way I can easily resolve conflicts there when
> they arise.
> 
> The device tree bindings (patches 3 & 4) traditionally go along with
> the driver changes, though.
> 
> If you prefer the patch series to be split, that's fine. For other
> subsystems we usually deal with this by having one series and then the
> subsystem maintainer picking up all the non-DT changes and I take the
> rest.

OK, that's fine for me.
Let's revisit the latest patchset.


thanks,

Takashi