Commit eb275167 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM Device-tree updates from Olof Johansson:
 "As always, the bulk of updates.  Some of the news this cycle:

  New SoC descriptions:
   - Broadcom BCM2711
   - Amlogic Meson A1 and G12
   - Freescale S32V234
   - Marvell Armada AP807/AP807-quad and CP115
   - Realtek RTD1293 and RTD1296
   - Rockchip RK3308

  New boards and platforms:
   - Allwinner: NanoPi Duo2
   - Amlogic: Ugoos am6
   - Atmel at91: Overkiz Kizbox2/4
   - Broadcom: RPi4, Luxul XWC-2000
   - Marvell: New Espressobin flavor
   - NXP: i.MX8MN LPDDR4 EVK, i.MX8QXP Colibri, S32V234 EVB, Netronix
     E60K02 and Kobo Clara HD, Kontron N6311 and N6411, OPOS6UL and
     OPOS6ULDev
   - Renesas: Salvator-XS
   - Rockchip: Beelink A1 (rk3308), rk3308 eval boards, rk3399-roc-pc"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (653 commits)
  ARM: dts: logicpd-torpedo: Disable USB Host
  arm: dts: mt6323: add keys, power-controller, rtc and codec
  arm64: dts: mt8183: add systimer0 device node
  dt-bindings: mediatek: update bindings for MT8183 systimer
  arm64: dts: rockchip: fix sdmmc detection on boot on rk3328-roc-cc
  arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
  arm64: dts: rockchip: Add Beelink A1
  dt-bindings: ARM: rockchip: Add Beelink A1
  arm64: dts: rockchip: Add RK3328 audio pipelines
  arm64: dts: ti: k3-j721e-common-proc-board: Add USB ports
  arm64: dts: ti: k3-j721e-main: add USB controller nodes
  ARM: dts: aspeed-g6: Add timer description
  ARM: dts: aspeed: ast2600evb: Enable i2c buses
  ARM: dts: at91: add a dts and dtsi file for kizbox2 based boards
  dt-bindings: arm: at91: Document Kizbox2-2 board binding
  arm64: dts: meson-gx: fix i2c compatible
  arm64: dts: meson-gx: cec node should be disabled by default
  arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible
  arm64: dts: meson-gxm: fix gpu irq order
  arm64: dts: meson-g12a: fix gpu irq order
  ...
parents ec939e4c 5f1f1528

Documentation/devicetree/bindings/arm/amlogic.yaml

+8 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ properties: 
              - amlogic,p212

              - hwacom,amazetv

              - khadas,vim

              - libretech,cc

              - libretech,aml-s905x-cc

              - nexbox,a95x

          - const: amlogic,s905x

          - const: amlogic,meson-gxl
@@ -147,6 +147,7 @@ properties: 
          - enum:

              - hardkernel,odroid-n2

              - khadas,vim3

              - ugoos,am6

          - const: amlogic,s922x

          - const: amlogic,g12b
@@ -156,4 +157,10 @@ properties: 
              - seirobotics,sei610

              - khadas,vim3l

          - const: amlogic,sm1



      - description: Boards with the Amlogic Meson A1 A113L SoC

        items:

          - enum:

              - amlogic,ad401

          - const: amlogic,a1

...

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+14 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ properties: 
          - const: atmel,at91sam9x5

          - const: atmel,at91sam9



      - description: Overkiz kizbox3 board

        items:

          - const: overkiz,kizbox3-hs

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - items:

          - const: atmel,sama5d27

          - const: atmel,sama5d2
@@ -73,6 +80,13 @@ properties: 
          - const: atmel,sama5d3

          - const: atmel,sama5



      - description: Overkiz kizbox2 board with two heads

        items:

          - const: overkiz,kizbox2-2

          - const: atmel,sama5d31

          - const: atmel,sama5d3

          - const: atmel,sama5



      - items:

          - enum:

              - atmel,sama5d31

Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bcm/bcm2835.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom BCM2711/BCM2835 Platforms Device Tree Bindings



maintainers:

  - Eric Anholt <eric@anholt.net>

  - Stefan Wahren <wahrenst@gmx.net>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: BCM2711 based Boards

        items:

          - enum:

              - raspberrypi,4-model-b

          - const: brcm,bcm2711



      - description: BCM2835 based Boards

        items:

          - enum:

              - raspberrypi,model-a

              - raspberrypi,model-a-plus

              - raspberrypi,model-b

              - raspberrypi,model-b-i2c0  # Raspberry Pi Model B (no P5)

              - raspberrypi,model-b-rev2

              - raspberrypi,model-b-plus

              - raspberrypi,compute-module

              - raspberrypi,model-zero

              - raspberrypi,model-zero-w

          - const: brcm,bcm2835



      - description: BCM2836 based Boards

        items:

          - enum:

              - raspberrypi,2-model-b

          - const: brcm,bcm2836



      - description: BCM2837 based Boards

        items:

          - enum:

              - raspberrypi,3-model-a-plus

              - raspberrypi,3-model-b

              - raspberrypi,3-model-b-plus

              - raspberrypi,3-compute-module

              - raspberrypi,3-compute-module-lite

          - const: brcm,bcm2837



...

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
Broadcom BCM2835 device tree bindings

-------------------------------------------



Raspberry Pi Model A

Required root node properties:

compatible = "raspberrypi,model-a", "brcm,bcm2835";



Raspberry Pi Model A+

Required root node properties:

compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";



Raspberry Pi Model B

Required root node properties:

compatible = "raspberrypi,model-b", "brcm,bcm2835";



Raspberry Pi Model B (no P5)

early model B with I2C0 rather than I2C1 routed to the expansion header

Required root node properties:

compatible = "raspberrypi,model-b-i2c0", "brcm,bcm2835";



Raspberry Pi Model B rev2

Required root node properties:

compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";



Raspberry Pi Model B+

Required root node properties:

compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";



Raspberry Pi 2 Model B

Required root node properties:

compatible = "raspberrypi,2-model-b", "brcm,bcm2836";



Raspberry Pi 3 Model A+

Required root node properties:

compatible = "raspberrypi,3-model-a-plus", "brcm,bcm2837";



Raspberry Pi 3 Model B

Required root node properties:

compatible = "raspberrypi,3-model-b", "brcm,bcm2837";



Raspberry Pi 3 Model B+

Required root node properties:

compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";



Raspberry Pi Compute Module 3

Required root node properties:

compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";



Raspberry Pi Compute Module 3 Lite

Required root node properties:

compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837";



Raspberry Pi Zero

Required root node properties:

compatible = "raspberrypi,model-zero", "brcm,bcm2835";



Raspberry Pi Zero W

Required root node properties:

compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";



Generic BCM2835 board

Required root node properties:

compatible = "brcm,bcm2835";

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ properties: 
              - marvell,armada-390-smp

              - marvell,armada-xp-smp

              - marvell,98dx3236-smp

              - marvell,mmp3-smp

              - mediatek,mt6589-smp

              - mediatek,mt81xx-tz-smp

              - qcom,gcc-msm8660

CRA Git | Maintained and supported by SUSTech CRA and CCSE