| Message ID | 20250113163648.1757178-1-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [GIT,PULL] Reset controller updates for v6.14 | expand |
On Mon, Jan 13, 2025, at 17:36, Philipp Zabel wrote: > Dear arm-soc maintainers, > > The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: > > Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) > > are available in the Git repository at: Hi Philipp, I have no objections to the contents, but it would be good to avoid the back-merge of rc3 into my current branch that is based on -rc2. I see that the two patches for the reset driver depend on commit 5ae1a43486fb ("clk: amlogic: axg-audio: revert reset implementation"), which went into rc3, and this was clearly the reason for using that as the base. Would it be possible to rebase your branch directly on that 5ae1a43486fb commit from upstream? Arnd
Hi Arnd, On Mi, 2025-01-15 at 17:13 +0100, Arnd Bergmann wrote: > On Mon, Jan 13, 2025, at 17:36, Philipp Zabel wrote: > > Dear arm-soc maintainers, > > > > The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: > > > > Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) > > > > are available in the Git repository at: > > Hi Philipp, > > I have no objections to the contents, but it would be good to > avoid the back-merge of rc3 into my current branch that > is based on -rc2. > > I see that the two patches for the reset driver depend on > commit 5ae1a43486fb ("clk: amlogic: axg-audio: revert reset > implementation"), which went into rc3, and this was clearly > the reason for using that as the base. > > Would it be possible to rebase your branch directly on that > 5ae1a43486fb commit from upstream? I've rebased and sent a PR for a new tag reset-fixes-for-v6.13-2. regards Philipp
On Mi, 2025-01-15 at 17:58 +0100, Philipp Zabel wrote: > Hi Arnd, > > On Mi, 2025-01-15 at 17:13 +0100, Arnd Bergmann wrote: > > On Mon, Jan 13, 2025, at 17:36, Philipp Zabel wrote: > > > Dear arm-soc maintainers, > > > > > > The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: > > > > > > Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) > > > > > > are available in the Git repository at: > > > > Hi Philipp, > > > > I have no objections to the contents, but it would be good to > > avoid the back-merge of rc3 into my current branch that > > is based on -rc2. > > > > I see that the two patches for the reset driver depend on > > commit 5ae1a43486fb ("clk: amlogic: axg-audio: revert reset > > implementation"), which went into rc3, and this was clearly > > the reason for using that as the base. > > > > Would it be possible to rebase your branch directly on that > > 5ae1a43486fb commit from upstream? > > I've rebased and sent a PR for a new tag reset-fixes-for-v6.13-2. Sorry, it's late. Same for reset-for-v6.14-2 instead. regards Philipp
On Wed, Jan 15, 2025, at 18:04, Philipp Zabel wrote: > On Mi, 2025-01-15 at 17:58 +0100, Philipp Zabel wrote: >> Hi Arnd, >> >> On Mi, 2025-01-15 at 17:13 +0100, Arnd Bergmann wrote: >> > On Mon, Jan 13, 2025, at 17:36, Philipp Zabel wrote: >> > > Dear arm-soc maintainers, >> > > >> > > The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: >> > > >> > > Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) >> > > >> > > are available in the Git repository at: >> > >> > Hi Philipp, >> > >> > I have no objections to the contents, but it would be good to >> > avoid the back-merge of rc3 into my current branch that >> > is based on -rc2. >> > >> > I see that the two patches for the reset driver depend on >> > commit 5ae1a43486fb ("clk: amlogic: axg-audio: revert reset >> > implementation"), which went into rc3, and this was clearly >> > the reason for using that as the base. >> > >> > Would it be possible to rebase your branch directly on that >> > 5ae1a43486fb commit from upstream? >> >> I've rebased and sent a PR for a new tag reset-fixes-for-v6.13-2. > > Sorry, it's late. Same for reset-for-v6.14-2 instead. Ok, pulled this one now. The fixes branch was already based on -rc7 and did not need a rebase, so I kept the previous one there. Arnd
Dear arm-soc maintainers, The following changes since commit 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8: Linux 6.13-rc3 (2024-12-15 15:58:23 -0800) are available in the Git repository at: git://git.pengutronix.de/pza/linux.git tags/reset-for-v6.14 for you to fetch changes up to 262c84cd062c8ea0ba9e1289ea64ebcbffb31794: reset: amlogic: aux: drop aux registration helper (2025-01-10 17:43:56 +0100) ---------------------------------------------------------------- Reset controller updates for v6.14 * Add support for A1 SoC in amlogic reset driver. * Drop aux registration helper from amlogic reset driver. ---------------------------------------------------------------- Jan Dakinevich (2): dt-bindings: reset: add bindings for A1 SoC audio reset controller reset: amlogic: add support for A1 SoC in auxiliary reset driver Jerome Brunet (2): reset: amlogic: aux: get regmap through parent device reset: amlogic: aux: drop aux registration helper drivers/reset/amlogic/reset-meson-aux.c | 97 +++++----------------- .../reset/amlogic,meson-a1-audio-reset.h | 36 ++++++++ include/soc/amlogic/reset-meson-aux.h | 23 ----- 3 files changed, 57 insertions(+), 99 deletions(-) create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h delete mode 100644 include/soc/amlogic/reset-meson-aux.h