Skip to content

Commit

Permalink
Merge tag 'arm-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/g…
Browse files Browse the repository at this point in the history
…it/soc/soc

Pull ARM devicetree updates from Arnd Bergmann:
 "Most of the changes fall into one of three categories: adding support
  for additional devices on existing machines, cleaning up issues found
  by the ongoing conversion to machine-readable bindings, and addressing
  minor mistakes in the existing DT data.

  Across SoC vendors, Qualcomm and Freescale stick out as getting the
  most updates, which corresponds to their dominance in the mobile phone
  and embedded industrial markets, respectively.

  There are 636 non-merge changeset in this branch, which is a little
  lower than most times, but more importantly we only add 36 machine
  files, which is about half of what we had the past few releases.

  Eight new SoCs are added, but all of them are variations of already
  supported SoC families, and most of them come with one reference board
  design from the SoC vendor:

   - Mediatek MT8186 is a Chromebook/Tablet type SoC, similar to the
     MT65xx series of phone SoCs, with two Cortex-A76 and six Cortex-A55
     cores.

   - TI AM62A is another member of the K3 family with Cortex-A53 cores,
     this one is targetted at Video/Vision processing for industrial and
     automotive applications.

   - NXP i.MX8DXL is another chip for this market in the ever-growing
     i.MX8 family, this one again with two Cortex-A35 cores.

   - Renesas R-Car H3Ne-1.7G (R8A779MB) and R-Car V3H2 (R8A77980A) are
     minor updates of R8A77951 and R8A77980, respectively.

   - Qualcomm IPQ8064-v2.0, IPQ8062 and IPQ8065 are all variants of the
     IPQ8064 chip, with minimally different features.

  The AMD Pensando Elba and Apple M1 Ultra SoC support was getting close
  this time, but in the end did not make the cut.

  The new machines based on existing SoC support are fairly uneventful:

   - Sony Xperia 1 IV is a fairly recent phone based on Qualcomm
     Snapdragon 8 Gen 1.

   - Three Samsung phones based on Snapdragon 410: Galaxy E5, E7 and
     Grand Max. These are added for both 32-bit and 64-bit kernels, as
     they originally shipped running 32-bit code.

   - Two new servers using AST2600 BMCs: AMD DaytonaX and Ampere Mt.
     Mitchell

   - Three new machines based on Rockchips RK3399 and RK3566: Anberic
     RG353P and RG503, Pine64 Pinephone Pro, Open AI Lab

   - Multiple NXP i.MX6/i.MX8 based boards: Kontron SL/BL i.MX8MM OSM-S,
     i.MX8MM Gateworks GW7904, MSC SM2S-IMX8PLUS SoM and carrier board

   - Two development boards in the Microchip AT91 family: SAMA5D3-EDS
     and lan966x-pcb8290.

   - Minor variants of existing boards using Amlogic, Broadcom, Marvell,
     Rockchips, Freescale Layerscape and Socionext Uniphier SoCs"

* tag 'arm-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (617 commits)
  Revert "ARM: dts: BCM5301X: Add basic PCI controller properties"
  ARM: dts: s5pv210: correct double "pins" in pinmux node
  ARM: dts: exynos: fix polarity of VBUS GPIO of Origen
  arm64: dts: exynos: fix polarity of "enable" line of NFC chip in TM2
  arm64: dts: uniphier: Add L2 cache node
  arm64: dts: uniphier: Remove compatible "snps,dw-pcie" from pcie node
  arm64: dts: uniphier: Fix opp-table node name for LD20
  arm64: dts: uniphier: Add USB-device support for PXs3 reference board
  arm64: dts: uniphier: Add ahci controller nodes for PXs3
  arm64: dts: uniphier: Use GIC interrupt definitions
  arm64: dts: uniphier: Rename gpio-hog nodes
  arm64: dts: uniphier: Rename usb-glue node for USB3 to usb-controller
  arm64: dts: uniphier: Rename usb-phy node for USB2 to usb-controller
  arm64: dts: uniphier: Rename pvtctl node to thermal-sensor
  ARM: dts: uniphier: Remove compatible "snps,dw-pcie-ep" from pcie-ep node
  ARM: dts: uniphier: Move interrupt-parent property to each child node in uniphier-support-card
  ARM: dts: uniphier: Add ahci controller nodes for PXs2
  ARM: dts: uniphier: Add ahci controller nodes for Pro4
  ARM: dts: uniphier: Use GIC interrupt definitions
  ARM: dts: uniphier: Rename gpio-hog node
  ...
  • Loading branch information
torvalds committed Oct 6, 2022
2 parents ff6862c + 114b9da commit 7171a8d
Show file tree
Hide file tree
Showing 556 changed files with 27,832 additions and 4,606 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/amlogic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ properties:
- enum:
- amlogic,q200
- amlogic,q201
- azw,gt1-ultimate
- khadas,vim2
- kingnovel,r-box-pro
- libretech,aml-s912-pc
Expand All @@ -136,6 +137,7 @@ properties:
- enum:
- amlogic,s400
- jethome,jethub-j100
- jethome,jethub-j110
- const: amlogic,a113d
- const: amlogic,meson-axg

Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ properties:
- description: AST2500 based boards
items:
- enum:
- amd,daytonax-bmc
- amd,ethanolx-bmc
- ampere,mtjade-bmc
- aspeed,ast2500-evb
Expand Down Expand Up @@ -69,6 +70,7 @@ properties:
- description: AST2600 based boards
items:
- enum:
- ampere,mtmitchell-bmc
- aspeed,ast2600-evb
- aspeed,ast2600-evb-a1
- facebook,bletchley-bmc
Expand Down
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/arm/atmel-at91.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,13 @@ properties:
- const: atmel,sama5d3
- const: atmel,sama5

- description: Microchip SAMA5D3 Ethernet Development System Board
items:
- const: microchip,sama5d3-eds
- const: atmel,sama5d36
- const: atmel,sama5d3
- const: atmel,sama5

- description: CalAmp LMU5000 board
items:
- const: calamp,lmu5000
Expand Down
42 changes: 0 additions & 42 deletions Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml

This file was deleted.

25 changes: 25 additions & 0 deletions Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ maintainers:
- William Zhang <[email protected]>
- Anand Gore <[email protected]>
- Kursad Oney <[email protected]>
- Rafał Miłecki <[email protected]>

properties:
$nodename:
Expand All @@ -28,6 +29,30 @@ properties:
- const: brcm,bcm47622
- const: brcm,bcmbca

- description: BCM4906 based boards
items:
- enum:
- netgear,r8000p
- tplink,archer-c2300-v1
- const: brcm,bcm4906
- const: brcm,bcm4908
- const: brcm,bcmbca

- description: BCM4908 based boards
items:
- enum:
- asus,gt-ac5300
- brcm,bcm94908
- netgear,raxe500
- const: brcm,bcm4908
- const: brcm,bcmbca

- description: BCM49408 based boards
items:
- const: brcm,bcm49408
- const: brcm,bcm4908
- const: brcm,bcmbca

- description: BCM4912 based boards
items:
- enum:
Expand Down
26 changes: 0 additions & 26 deletions Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
Marvell Armada 37xx Platforms Device Tree Bindings
--------------------------------------------------

Boards using a SoC of the Marvell Armada 37xx family must carry the
following root node property:

- compatible: must contain "marvell,armada3710"

In addition, boards using the Marvell Armada 3720 SoC shall have the
following property before the previous one:

- compatible: must contain "marvell,armada3720"

Example:

compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";


Power management
----------------

Expand Down Expand Up @@ -48,11 +30,3 @@ avs: avs@11500 {
compatible = "marvell,armada-3700-avs", "syscon";
reg = <0x11500 0x40>;
}


CZ.NIC's Turris Mox SOHO router Device Tree Bindings
----------------------------------------------------

Required root node property:

- compatible: must contain "cznic,turris-mox"
47 changes: 47 additions & 0 deletions Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/marvell/armada-37xx.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Marvell Armada 37xx Platforms

maintainers:
- Robert Marko <[email protected]>

properties:
$nodename:
const: '/'
compatible:
oneOf:
- description: Armada 3720 SoC boards
items:
- enum:
- cznic,turris-mox
- globalscale,espressobin
- marvell,armada-3720-db
- methode,edpu
- methode,udpu
- const: marvell,armada3720
- const: marvell,armada3710

- description: Globalscale Espressobin boards
items:
- enum:
- globalscale,espressobin-emmc
- globalscale,espressobin-ultra
- globalscale,espressobin-v7
- const: globalscale,espressobin
- const: marvell,armada3720
- const: marvell,armada3710

- description: Globalscale Espressobin V7 boards
items:
- enum:
- globalscale,espressobin-v7-emmc
- const: globalscale,espressobin-v7
- const: globalscale,espressobin
- const: marvell,armada3720
- const: marvell,armada3710

additionalProperties: true
21 changes: 21 additions & 0 deletions Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ properties:
- longcheer,l8910
- samsung,a3u-eur
- samsung,a5u-eur
- samsung,e5
- samsung,e7
- samsung,grandmax
- samsung,j5
- samsung,serranove
- wingtech,wt88047
Expand Down Expand Up @@ -450,6 +453,7 @@ properties:

- description: Google Pazquel with LTE and Parade (newest rev)
items:
- const: google,pazquel-sku6
- const: google,pazquel-sku4
- const: qcom,sc7180

Expand Down Expand Up @@ -550,6 +554,7 @@ properties:

- description: Qualcomm Technologies, Inc. sc7280 CRD platform (newest rev)
items:
- const: google,zoglin
- const: google,hoglin
- const: qcom,sc7280

Expand All @@ -565,16 +570,31 @@ properties:
- const: google,piglin
- const: qcom,sc7280

- description: Google Evoker (newest rev)
items:
- const: google,evoker
- const: qcom,sc7280

- description: Google Herobrine (newest rev)
items:
- const: google,herobrine
- const: qcom,sc7280

- description: Google Villager (rev0)
items:
- const: google,villager-rev0
- const: qcom,sc7280

- description: Google Villager (newest rev)
items:
- const: google,villager
- const: qcom,sc7280

- description: Google Villager with LTE (newest rev)
items:
- const: google,villager-sku512
- const: qcom,sc7280

- items:
- enum:
- lenovo,flex-5g
Expand Down Expand Up @@ -716,6 +736,7 @@ properties:
- enum:
- qcom,sm8450-hdk
- qcom,sm8450-qrd
- sony,pdx223
- const: qcom,sm8450

additionalProperties: true
Expand Down
16 changes: 16 additions & 0 deletions Documentation/devicetree/bindings/arm/renesas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ properties:
- renesas,r8a779m4
- renesas,r8a779m5
- renesas,r8a779m8
- renesas,r8a779mb
- enum:
- renesas,r8a7795
- renesas,r8a77961
Expand Down Expand Up @@ -291,6 +292,13 @@ properties:
- renesas,v3hsk # V3HSK (Y-ASK-RCAR-V3H-WS10)
- const: renesas,r8a77980

- description: R-Car V3H2 (R8A77980A)
items:
- enum:
- renesas,condor-i # Condor-I (RTP0RC77980SEBS012SA01)
- const: renesas,r8a77980a
- const: renesas,r8a77980

- description: R-Car E3 (R8A77990)
items:
- enum:
Expand Down Expand Up @@ -409,6 +417,14 @@ properties:
- const: renesas,r8a779m8
- const: renesas,r8a7795

- description: R-Car H3Ne-1.7G (R8A779MB)
items:
- enum:
- renesas,h3ulcb # H3ULCB (R-Car Starter Kit Premier)
- renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version)
- const: renesas,r8a779mb
- const: renesas,r8a7795

- description: RZ/N1D (R9A06G032)
items:
- enum:
Expand Down
Loading

0 comments on commit 7171a8d

Please sign in to comment.