mbox series

[GIT,PULL] Allwinner Device Tree Changes for 5.10

Message ID 4b6c06ea-b65f-469c-85cd-dfdabcd94269.lettre@localhost
State Superseded
Headers show
Series [GIT,PULL] Allwinner Device Tree Changes for 5.10 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git refs/tags/sunxi-dt-for-5.10-3

Message

Maxime Ripard Oct. 5, 2020, 8:38 a.m. UTC
Hi Arnd, Olof,

Please pull the following changes for the next release. It supersedes our previous (and with a
broken build) PRs.

Thanks, and sorry for the breakage,
Maxime

The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5:

  Linux 5.9-rc1 (2020-08-16 13:04:57 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git refs/tags/sunxi-dt-for-5.10-3

for you to fetch changes up to 47a6210cf859e24ec7644376828acadb7e89a423:

  ARM: dts: sun8i: v3s: Add simple-framebuffer (2020-10-05 10:21:44 +0200)

----------------------------------------------------------------
Our usual bunch of patches to support the Allwinner SoCs, this time
adding:
  - Allwinner A100 initial support
  - Mali, DMA, cedrus and IR Support for the R40
  - Crypto support for the v3s
  - simple-framebuffer support for the v3s
  - New board: Allwinner A100 Perf1, Pine64 Pinecube
-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX3rbaAAKCRDj7w1vZxhR
xdTVAQDkrNI7zhNlqWzHabhw6Yusj7dYlse/BwQNqJEhn+xzmAEAh0963S0pBYU9
bNiBN9R3tynN5aayRGxdxycdm29hTAA=
=RXi1
-----END PGP SIGNATURE-----

----------------------------------------------------------------
Alexander Kochetkov (1):
      arm64: dts: allwinner: replace numerical constant with CCU_CLKX

Corentin Labbe (1):
      dt-bindings: crypto: Specify that allwinner, sun8i-a33-crypto needs reset

Icenowy Zheng (8):
      dt-bindings: sram: sunxi-sram: add V3s compatible string
      ARM: dts: sun8i: V3/V3s/S3/S3L: add Ethernet support
      ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for UART2 RX/TX
      ARM: dts: sun8i: V3/V3s/S3/S3L: add CSI1 device node
      ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for 8-bit parallel CSI
      ARM: dts: sun8i: V3/V3s/S3/S3L: add pinctrl for I2C1 at PE bank
      dt-bindings: arm: sunxi: add Pine64 PineCube binding
      ARM: dts: sun8i: s3l: add support for Pine64 PineCube IP camera

Jernej Skrabec (10):
      dt-bindings: gpu: mali-utgard: Add Allwinner R40 compatible
      ARM: dts: sun8i: r40: Add Mali node
      dt-bindings: dma: allwinner,sun50i-a64-dma: Add R40 compatible
      ARM: dts: sun8i: r40: Add DMA node
      dt-bindings: media: allwinner, sun4i-a10-ir: Add R40 compatible
      ARM: dts: sun8i: r40: Add IR nodes
      ARM: dts: sun8i: r40: bananapi-m2-ultra: Enable IR
      dt-bindings: sram: allwinner, sun4i-a10-system-control: Add R40 compatibles
      ARM: dts: sun8i: r40: Add node for system controller
      ARM: dts: sun8i: r40: Add video engine node

Martin Cerveny (3):
      dt-bindings: crypto: Add compatible for V3s
      ARM: dts: sun8i: v3s: Enable crypto engine
      ARM: dts: sun8i: v3s: Add simple-framebuffer

Samuel Holland (4):
      arm64: dts: allwinner: Mark timer as stopped in suspend
      ARM: dts: sun8i: a33: Update codec widget names
      arm64: dts: allwinner: a64: Update codec widget names
      arm64: dts: allwinner: a64: Update the audio codec compatible

Stefan Monnier (1):
      ARM: dts: sun4i: Enable HDMI support on the Mele A1000

Yangtao Li (5):
      dt-bindings: irq: sun7i-nmi: fix dt-binding for a80 nmi
      dt-bindings: irq: sun7i-nmi: Add binding for A100's NMI controller
      arm64: allwinner: A100: add the basical Allwinner A100 DTSI file
      dt-bindings: arm: sunxi: Add Allwinner A100 Perf1 Board bindings
      arm64: allwinner: A100: add support for Allwinner Perf1 board


 Documentation/devicetree/bindings/arm/sunxi.yaml                                       |  10 ++-
 Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml               |   6 +-
 Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml                    |   9 +-
 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml                             |   2 +-
 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml |   5 +-
 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml                    |   5 +-
 Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml         |   9 ++-
 arch/arm/boot/dts/Makefile                                                             |   1 +-
 arch/arm/boot/dts/sun4i-a10-a1000.dts                                                  |  25 ++++++-
 arch/arm/boot/dts/sun8i-a33-olinuxino.dts                                              |   4 +-
 arch/arm/boot/dts/sun8i-a33.dtsi                                                       |   4 +-
 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts                                      |   4 +-
 arch/arm/boot/dts/sun8i-r40.dtsi                                                       | 104 +++++++++++++++++++++++-
 arch/arm/boot/dts/sun8i-s3-pinecube.dts                                                | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 arch/arm/boot/dts/sun8i-v3.dtsi                                                        |  13 +++-
 arch/arm/boot/dts/sun8i-v3s.dtsi                                                       | 118 ++++++++++++++++++++++++++-
 arch/arm64/boot/dts/allwinner/Makefile                                                 |   1 +-
 arch/arm64/boot/dts/allwinner/sun50i-a100-allwinner-perf1.dts                          | 180 ++++++++++++++++++++++++++++++++++++++++-
 arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi                                         | 359 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts                              |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts                              |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts                                    |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts                                  |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi                                |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts                                   |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts                          |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts                                   |   8 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi                                          |  20 ++--
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi                                           |   1 +-
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                                           |   1 +-
 30 files changed, 1129 insertions(+), 51 deletions(-)
 create mode 100644 arch/arm/boot/dts/sun8i-s3-pinecube.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100-allwinner-perf1.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi

Comments

Arnd Bergmann Oct. 26, 2020, 9:39 a.m. UTC | #1
On Mon, Oct 5, 2020 at 10:38 AM Maxime Ripard <mripard@kernel.org> wrote:
>
> Hi Arnd, Olof,
>
> Please pull the following changes for the next release. It supersedes our previous (and with a
> broken build) PRs.
>
> Thanks, and sorry for the breakage,

It appears we screwed this one up, as the version that made it into v5.10-rc1
was the previous pull request. There is now a possible bisection problem,
but as far as I can tell, the -rc1 version ended up being ok since the headers
were all merged before the dts files.

I saw that there was one extra commit in your branch ("dt-bindings: sram:
sunxi-sram: add V3s compatible string"), and I have cherry-picked that
one into the arm/fixes branch now. Please confirm that this was the right
thing to do.

      Arnd
Maxime Ripard Oct. 26, 2020, 11:15 a.m. UTC | #2
Hi Arnd,

On Mon, Oct 26, 2020 at 10:39:21AM +0100, Arnd Bergmann wrote:
> On Mon, Oct 5, 2020 at 10:38 AM Maxime Ripard <mripard@kernel.org> wrote:
> >
> > Hi Arnd, Olof,
> >
> > Please pull the following changes for the next release. It supersedes our previous (and with a
> > broken build) PRs.
> >
> > Thanks, and sorry for the breakage,
> 
> It appears we screwed this one up, as the version that made it into
> v5.10-rc1 was the previous pull request. There is now a possible
> bisection problem, but as far as I can tell, the -rc1 version ended up
> being ok since the headers were all merged before the dts files.

Yep, indeed

> I saw that there was one extra commit in your branch ("dt-bindings: sram:
> sunxi-sram: add V3s compatible string"), and I have cherry-picked that
> one into the arm/fixes branch now. Please confirm that this was the right
> thing to do.

I have a dozen or so fixes queued up already so I took it as well, but
I'll drop it if you applied it already.

Thanks!
Maxime