mbox series

[GIT,PULL,5/5] arm64: tegra: Device tree fixes for v5.12-rc6

Message ID 20210401172622.3352990-5-thierry.reding@gmail.com
State New
Headers show
Series [GIT,PULL,1/5] dt-bindings: Changes for v5.13-rc1 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt

Message

Thierry Reding April 1, 2021, 5:26 p.m. UTC
Hi ARM SoC maintainers,

The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:

  Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt

for you to fetch changes up to 405fa9e9d8664e830982c5fbcb70f9ba8656bafc:

  arm64: tegra: Move clocks from RT5658 endpoint to device node (2021-03-25 14:04:49 +0100)

Thanks,
Thierry

----------------------------------------------------------------
arm64: tegra: Device tree fixes for v5.12-rc6

This contains a couple of device tree fixes for the v5.12 release cycle.
These are needed for proper audio support on Jetson AGX Xavier, to boot
the Jetson Xavier NX from an SD card and to be able to suspend/resume
the Jetson TX2.

----------------------------------------------------------------
Jon Hunter (2):
      arm64: tegra: Set fw_devlink=on for Jetson TX2
      arm64: tegra: Fix mmc0 alias for Jetson Xavier NX

Sameer Pujar (1):
      arm64: tegra: Move clocks from RT5658 endpoint to device node

Thierry Reding (1):
      arm64: tegra: Add unit-address for ACONNECT on Tegra186

 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts  | 2 +-
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi      | 2 +-
 arch/arm64/boot/dts/nvidia/tegra186.dtsi            | 2 +-
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts  | 3 ++-
 arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 ++++
 arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 ++++
 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi      | 1 -
 7 files changed, 13 insertions(+), 5 deletions(-)

Comments

Arnd Bergmann April 1, 2021, 8:15 p.m. UTC | #1
From: Arnd Bergmann <arnd@arndb.de>

On Thu, 1 Apr 2021 19:26:22 +0200, Thierry Reding wrote:
> The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
> 
>   Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt
> 
> [...]

Merged into arm/dt, thanks!

merge commit: 520f30feb864e9baaf7bed677892b478ffd10232

       Arnd
Thierry Reding April 23, 2021, 12:56 p.m. UTC | #2
On Thu, Apr 01, 2021 at 07:26:22PM +0200, Thierry Reding wrote:
> Hi ARM SoC maintainers,
> 
> The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
> 
>   Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt
> 
> for you to fetch changes up to 405fa9e9d8664e830982c5fbcb70f9ba8656bafc:
> 
>   arm64: tegra: Move clocks from RT5658 endpoint to device node (2021-03-25 14:04:49 +0100)
> 
> Thanks,
> Thierry

Hi Arnd,

I noticed that v5.12-rc8 is still broken because of the missing
fw_devlink=on patch from this PR. This PR was meant to go into v5.12,
but it looks like you pulled it for the next release.

In retrospect I realize that the way I sent this out was rather
confusing. Any chance you can still pull these into v5.12 to unbreak
the final release?

Thanks,
Thierry

> ----------------------------------------------------------------
> arm64: tegra: Device tree fixes for v5.12-rc6
> 
> This contains a couple of device tree fixes for the v5.12 release cycle.
> These are needed for proper audio support on Jetson AGX Xavier, to boot
> the Jetson Xavier NX from an SD card and to be able to suspend/resume
> the Jetson TX2.
> 
> ----------------------------------------------------------------
> Jon Hunter (2):
>       arm64: tegra: Set fw_devlink=on for Jetson TX2
>       arm64: tegra: Fix mmc0 alias for Jetson Xavier NX
> 
> Sameer Pujar (1):
>       arm64: tegra: Move clocks from RT5658 endpoint to device node
> 
> Thierry Reding (1):
>       arm64: tegra: Add unit-address for ACONNECT on Tegra186
> 
>  arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts  | 2 +-
>  arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi      | 2 +-
>  arch/arm64/boot/dts/nvidia/tegra186.dtsi            | 2 +-
>  arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts  | 3 ++-
>  arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 ++++
>  arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 ++++
>  arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi      | 1 -
>  7 files changed, 13 insertions(+), 5 deletions(-)
Arnd Bergmann April 23, 2021, 1:42 p.m. UTC | #3
On Fri, Apr 23, 2021 at 2:56 PM Thierry Reding <thierry.reding@gmail.com> wrote:
>
> On Thu, Apr 01, 2021 at 07:26:22PM +0200, Thierry Reding wrote:
> > Hi ARM SoC maintainers,
> >
> > The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
> >
> >   Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt
> >
> > for you to fetch changes up to 405fa9e9d8664e830982c5fbcb70f9ba8656bafc:
> >
> >   arm64: tegra: Move clocks from RT5658 endpoint to device node (2021-03-25 14:04:49 +0100)
> >
> > Thanks,
> > Thierry
>
> Hi Arnd,
>
> I noticed that v5.12-rc8 is still broken because of the missing
> fw_devlink=on patch from this PR. This PR was meant to go into v5.12,
> but it looks like you pulled it for the next release.

Indeed, I never noticed the difference between the subject line and
the tag name. I usually go by the subject to see what branch to pick
and only then check if there are any discrepancies, but I missed this one.

> In retrospect I realize that the way I sent this out was rather
> confusing. Any chance you can still pull these into v5.12 to unbreak
> the final release?

I've pulled it into the arm/fixes branch now. There is only one other fix in
the arm/fixes, but I should still be able to send it out tomorrow.

      Arnd
Thierry Reding April 23, 2021, 1:59 p.m. UTC | #4
On Fri, Apr 23, 2021 at 03:42:42PM +0200, Arnd Bergmann wrote:
> On Fri, Apr 23, 2021 at 2:56 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> >
> > On Thu, Apr 01, 2021 at 07:26:22PM +0200, Thierry Reding wrote:
> > > Hi ARM SoC maintainers,
> > >
> > > The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
> > >
> > >   Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
> > >
> > > are available in the Git repository at:
> > >
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.13-arm64-dt
> > >
> > > for you to fetch changes up to 405fa9e9d8664e830982c5fbcb70f9ba8656bafc:
> > >
> > >   arm64: tegra: Move clocks from RT5658 endpoint to device node (2021-03-25 14:04:49 +0100)
> > >
> > > Thanks,
> > > Thierry
> >
> > Hi Arnd,
> >
> > I noticed that v5.12-rc8 is still broken because of the missing
> > fw_devlink=on patch from this PR. This PR was meant to go into v5.12,
> > but it looks like you pulled it for the next release.
> 
> Indeed, I never noticed the difference between the subject line and
> the tag name. I usually go by the subject to see what branch to pick
> and only then check if there are any discrepancies, but I missed this one.

Oh yeah, that's even worse than I thought. I hadn't realized that my
scripts had named the tag tegra-for-5.13-arm64-dt.

Next time I'm going to take a closer look at the tag name and also send
out fixes PRs separately from the feature PRs.

> > In retrospect I realize that the way I sent this out was rather
> > confusing. Any chance you can still pull these into v5.12 to unbreak
> > the final release?
> 
> I've pulled it into the arm/fixes branch now. There is only one other fix in
> the arm/fixes, but I should still be able to send it out tomorrow.

Excellent, thanks!

Thierry