mbox series

[GIT,PULL] Amlogic fixes for v4.19-rc

Message ID 7hk1o9895g.fsf@baylibre.com (mailing list archive)
State Not Applicable
Headers show
Series [GIT,PULL] Amlogic fixes for v4.19-rc | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes

Message

Kevin Hilman Aug. 29, 2018, 3:50 p.m. UTC
Olof, Arnd,

A round of DT fixes for Amlogic SoCs for v4.19-rc.

The are all platform-specific DT, 2 are simple fixes, and the 3
meson-axg patches are to enable audio devices that were fully enabled by
reset changes in the late PR recently sent and merged.

Kevin

The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:

  Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes

for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:

  ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)

----------------------------------------------------------------
Amlogic DT fixes for v4.19-rc
- meson8b: fix clock controller register sizes
- AXG/s400: enable audio devices

----------------------------------------------------------------
Jerome Brunet (3):
      arm64: dts: meson-axg: add audio fifos
      arm64: dts: meson-axg: s400: enable audio devices
      arm64: dts: meson-axg: s400: add sound card

Martin Blumenstingl (2):
      ARM: dts: meson8: fix the clock controller register size
      ARM: dts: meson8b: fix the clock controller register size

 arch/arm/boot/dts/meson8.dtsi                  |   2 +-
 arch/arm/boot/dts/meson8b.dtsi                 |   2 +-
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi     |  67 ++++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 2 deletions(-)

Comments

Olof Johansson Aug. 29, 2018, 6:54 p.m. UTC | #1
On Wed, Aug 29, 2018 at 08:50:03AM -0700, Kevin Hilman wrote:
> Olof, Arnd,
> 
> A round of DT fixes for Amlogic SoCs for v4.19-rc.
> 
> The are all platform-specific DT, 2 are simple fixes, and the 3
> meson-axg patches are to enable audio devices that were fully enabled by
> reset changes in the late PR recently sent and merged.
> 
> Kevin
> 
> The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> 
>   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes
> 
> for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:
> 
>   ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)
> 
> ----------------------------------------------------------------
> Amlogic DT fixes for v4.19-rc
> - meson8b: fix clock controller register sizes
> - AXG/s400: enable audio devices
> 
> ----------------------------------------------------------------
> Jerome Brunet (3):
>       arm64: dts: meson-axg: add audio fifos
>       arm64: dts: meson-axg: s400: enable audio devices
>       arm64: dts: meson-axg: s400: add sound card

Hmm. So we merged some reset controller changes very late because the audio
drivers had landed and were now going to be useful, but this seems to indicate
that there's more material needed too? Or is it that this enables also for the
64-bit platforms and the 32-bit are already in 4.19?

Those should be 4.20 material by now, since the merge window is behind us.


-Olof
Kevin Hilman Aug. 29, 2018, 8:42 p.m. UTC | #2
On Wed, Aug 29, 2018 at 1:31 PM Olof Johansson <olof@lixom.net> wrote:
>
> On Wed, Aug 29, 2018 at 08:50:03AM -0700, Kevin Hilman wrote:
> > Olof, Arnd,
> >
> > A round of DT fixes for Amlogic SoCs for v4.19-rc.
> >
> > The are all platform-specific DT, 2 are simple fixes, and the 3
> > meson-axg patches are to enable audio devices that were fully enabled by
> > reset changes in the late PR recently sent and merged.
> >
> > Kevin
> >
> > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> >
> >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> >
> > are available in the git repository at:
> >
> >   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes
> >
> > for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:
> >
> >   ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)
> >
> > ----------------------------------------------------------------
> > Amlogic DT fixes for v4.19-rc
> > - meson8b: fix clock controller register sizes
> > - AXG/s400: enable audio devices
> >
> > ----------------------------------------------------------------
> > Jerome Brunet (3):
> >       arm64: dts: meson-axg: add audio fifos
> >       arm64: dts: meson-axg: s400: enable audio devices
> >       arm64: dts: meson-axg: s400: add sound card
>
> Hmm. So we merged some reset controller changes very late because the audio
> drivers had landed and were now going to be useful, but this seems to indicate
> that there's more material needed too?
> Or is it that this enables also for the 64-bit platforms and the 32-bit are already in 4.19?

The 32-bit DT patches in this pull are just fixes.

The 3 arm64 DT patches here were part of a larger series to enable
audio on this 64-bit platform.  Most of that series is already merged
in v4.19, but these 3 patches were held back due to the dependency on
the reset controller, so I was hoping to get everything in to v4.19.
Everything has been in -next for awhile now and well tested (though I
rebased them onto -rc1 for this pull)

I was hoping to have everything land in 4.19 to keep all the audio
support together, but if you prefer, I can respin with only the arm32
fixes and send the arm64 changes for v4.20.

Kevin
Olof Johansson Sept. 2, 2018, 1:21 a.m. UTC | #3
Hi,

On Wed, Aug 29, 2018 at 1:42 PM, Kevin Hilman <khilman@baylibre.com> wrote:
> On Wed, Aug 29, 2018 at 1:31 PM Olof Johansson <olof@lixom.net> wrote:
>>
>> On Wed, Aug 29, 2018 at 08:50:03AM -0700, Kevin Hilman wrote:
>> > Olof, Arnd,
>> >
>> > A round of DT fixes for Amlogic SoCs for v4.19-rc.
>> >
>> > The are all platform-specific DT, 2 are simple fixes, and the 3
>> > meson-axg patches are to enable audio devices that were fully enabled by
>> > reset changes in the late PR recently sent and merged.
>> >
>> > Kevin
>> >
>> > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
>> >
>> >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes
>> >
>> > for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:
>> >
>> >   ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)
>> >
>> > ----------------------------------------------------------------
>> > Amlogic DT fixes for v4.19-rc
>> > - meson8b: fix clock controller register sizes
>> > - AXG/s400: enable audio devices
>> >
>> > ----------------------------------------------------------------
>> > Jerome Brunet (3):
>> >       arm64: dts: meson-axg: add audio fifos
>> >       arm64: dts: meson-axg: s400: enable audio devices
>> >       arm64: dts: meson-axg: s400: add sound card
>>
>> Hmm. So we merged some reset controller changes very late because the audio
>> drivers had landed and were now going to be useful, but this seems to indicate
>> that there's more material needed too?
>> Or is it that this enables also for the 64-bit platforms and the 32-bit are already in 4.19?
>
> The 32-bit DT patches in this pull are just fixes.
>
> The 3 arm64 DT patches here were part of a larger series to enable
> audio on this 64-bit platform.  Most of that series is already merged
> in v4.19, but these 3 patches were held back due to the dependency on
> the reset controller, so I was hoping to get everything in to v4.19.
> Everything has been in -next for awhile now and well tested (though I
> rebased them onto -rc1 for this pull)
>
> I was hoping to have everything land in 4.19 to keep all the audio
> support together, but if you prefer, I can respin with only the arm32
> fixes and send the arm64 changes for v4.20.

As discussed on IRC, I think we're at a point where we should stick to
the fixes only and queue the rest for 4.20. Care to respin the branch
and pull request?


Thanks!


-Olof
Martin Blumenstingl Sept. 2, 2018, 9:30 p.m. UTC | #4
Hi Kevin,

On Sun, Sep 2, 2018 at 3:22 AM Olof Johansson <olof@lixom.net> wrote:
>
> Hi,
>
> On Wed, Aug 29, 2018 at 1:42 PM, Kevin Hilman <khilman@baylibre.com> wrote:
> > On Wed, Aug 29, 2018 at 1:31 PM Olof Johansson <olof@lixom.net> wrote:
> >>
> >> On Wed, Aug 29, 2018 at 08:50:03AM -0700, Kevin Hilman wrote:
> >> > Olof, Arnd,
> >> >
> >> > A round of DT fixes for Amlogic SoCs for v4.19-rc.
> >> >
> >> > The are all platform-specific DT, 2 are simple fixes, and the 3
> >> > meson-axg patches are to enable audio devices that were fully enabled by
> >> > reset changes in the late PR recently sent and merged.
> >> >
> >> > Kevin
> >> >
> >> > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> >> >
> >> >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> >> >
> >> > are available in the git repository at:
> >> >
> >> >   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes
> >> >
> >> > for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:
> >> >
> >> >   ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)
> >> >
> >> > ----------------------------------------------------------------
> >> > Amlogic DT fixes for v4.19-rc
> >> > - meson8b: fix clock controller register sizes
I don't think it's worth re-building a "fixes" branch if it's just for
my two patches
the register sizes have been incorrect basically since forever
so I'm also happy if these go into 4.20/5.0 (however it's going to be called)


Regards
Martin
Kevin Hilman Sept. 4, 2018, 9:12 p.m. UTC | #5
On Sun, Sep 2, 2018 at 2:30 PM Martin Blumenstingl
<martin.blumenstingl@googlemail.com> wrote:
>
> Hi Kevin,
>
> On Sun, Sep 2, 2018 at 3:22 AM Olof Johansson <olof@lixom.net> wrote:
> >
> > Hi,
> >
> > On Wed, Aug 29, 2018 at 1:42 PM, Kevin Hilman <khilman@baylibre.com> wrote:
> > > On Wed, Aug 29, 2018 at 1:31 PM Olof Johansson <olof@lixom.net> wrote:
> > >>
> > >> On Wed, Aug 29, 2018 at 08:50:03AM -0700, Kevin Hilman wrote:
> > >> > Olof, Arnd,
> > >> >
> > >> > A round of DT fixes for Amlogic SoCs for v4.19-rc.
> > >> >
> > >> > The are all platform-specific DT, 2 are simple fixes, and the 3
> > >> > meson-axg patches are to enable audio devices that were fully enabled by
> > >> > reset changes in the late PR recently sent and merged.
> > >> >
> > >> > Kevin
> > >> >
> > >> > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> > >> >
> > >> >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> > >> >
> > >> > are available in the git repository at:
> > >> >
> > >> >   https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-fixes
> > >> >
> > >> > for you to fetch changes up to 1caa378e092f22d02e8a46216cbf1c8e8101163a:
> > >> >
> > >> >   ARM: dts: meson8b: fix the clock controller register size (2018-08-29 08:38:21 -0700)
> > >> >
> > >> > ----------------------------------------------------------------
> > >> > Amlogic DT fixes for v4.19-rc
> > >> > - meson8b: fix clock controller register sizes
> I don't think it's worth re-building a "fixes" branch if it's just for
> my two patches
> the register sizes have been incorrect basically since forever
> so I'm also happy if these go into 4.20/5.0 (however it's going to be called)

OK, I'll just queue everything for $NEXT

Kevin