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

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

Pull ARM devicetree updates from Olof Johansson:
 "Like always, the DT branch is sizable. There are numerous additions
  and fixes to existing platforms, but also a handful of new ones
  introduced. Less than some other releases, but there's been
  significant work on cleanups, refactorings and device enabling on
  existing platforms.

  A non-exhaustive list of new material:

   - Refactoring of BCM2711 dtsi structure to add support for the
     Raspberry Pi 400

   - Rockchip: RK3568 SoC and EVB, video codecs for
     rk3036/3066/3188/322x

   - Qualcomm: SA8155p Automotive platform (SM8150 derivative),
     SM8150/8250 enhancements and support for Sony Xperia 1/1II and
     5/5II

   - TI K3: PCI/USB3 support on AM64-sk boards, R5 remoteproc
     definitions

   - TI OMAP: Various cleanups

   - Tegra: Audio support for Jetson Xavier NX, SMMU support on Tegra194

   - Qualcomm: lots of additions for peripherals across several SoCs,
     and new support for Microsoft Surface Duo (SM8150-based), Huawei
     Ascend G7.

   - i.MX: Numerous additions of features across SoCs and boards.

   - Allwinner: More device bindings for V3s, Forlinx OKA40i-C and
     NanoPi R1S H5 boards

   - MediaTek: More device bindings for mt8167, new Chromebook system
     variants for mt8183

   - Renesas: RZ/G2L SoC and EVK added

   - Amlogic: BananaPi BPI-M5 board added"

* tag 'arm-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (511 commits)
  arm64: dts: rockchip: add basic dts for RK3568 EVB
  arm64: dts: rockchip: add core dtsi for RK3568 SoC
  arm64: dts: rockchip: add generic pinconfig settings used by most Rockchip socs
  ARM: dts: rockchip: add vpu and vdec node for RK322x
  ARM: dts: rockchip: add vpu nodes for RK3066 and RK3188
  ARM: dts: rockchip: add vpu node for RK3036
  arm64: dts: ipq8074: Add QUP6 I2C node
  arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for rk3399-roc-pc
  arm64: dts: rockchip: Re-add regulator-boot-on, regulator-always-on for vdd_gpu on rk3399-roc-pc
  arm64: dts: rockchip: add ir-receiver for rk3399-roc-pc
  arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly
  arm64: dts: rockchip: Sort rk3399 firefly pinmux entries
  arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly
  arm64: dts: rockchip: add SPDIF node for rk3399-firefly
  arm64: dts: rockchip: Add Rotation Property for OGA Panel
  arm64: dts: qcom: sc7180: bus votes for eMMC and SD card
  arm64: dts: qcom: sm8250-edo: Add Samsung touchscreen
  arm64: dts: qcom: sm8250-edo: Enable GPI DMA
  arm64: dts: qcom: sm8250-edo: Enable ADSP/CDSP/SLPI
  arm64: dts: qcom: sm8250-edo: Enable PCIe
  ...
parents 6e207b88 b62b189f

Documentation/devicetree/bindings/arm/amlogic.yaml

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ properties: 
      - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC

        items:

          - enum:

              - bananapi,bpi-m5

              - hardkernel,odroid-c4

              - hardkernel,odroid-hc4

              - khadas,vim3l

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

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - description: BCM2711 based Boards

        items:

          - enum:

              - raspberrypi,400

              - raspberrypi,4-model-b

          - const: brcm,bcm2711

Documentation/devicetree/bindings/arm/fsl.yaml

+13 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ properties: 
              - boundary,imx6q-nitrogen6x

              - compulab,cm-fx6           # CompuLab CM-FX6

              - dmo,imx6q-edmqmx6         # Data Modul eDM-QMX6 Board

              - ds,imx6q-sbc              # Da Sheng COM-9XX Modules

              - embest,imx6q-marsboard    # Embest MarS Board i.MX6Dual

              - emtrion,emcon-mx6         # emCON-MX6D or emCON-MX6Q SoM

              - emtrion,emcon-mx6-avari   # emCON-MX6D or emCON-MX6Q SoM on Avari Base
@@ -400,6 +401,17 @@ properties: 
          - const: armadeus,imx6dl-apf6         # APF6 (Solo) SoM

          - const: fsl,imx6dl



      - description: i.MX6DL based congatec QMX6 Boards

        items:

          - enum:

              - ge,imx6dl-b105v2          # General Electric B105v2

              - ge,imx6dl-b105pv2         # General Electric B105Pv2

              - ge,imx6dl-b125v2          # General Electric B125v2

              - ge,imx6dl-b125pv2         # General Electric B125Pv2

              - ge,imx6dl-b155v2          # General Electric B155v2

          - const: congatec,qmx6

          - const: fsl,imx6dl



      - description: i.MX6DL based DFI FS700-M60-6DL Board

        items:

          - const: dfi,fs700-m60-6dl
@@ -685,6 +697,7 @@ properties: 
              - gw,imx8mm-gw71xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw72xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw73xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw7901          # i.MX8MM Gateworks Board

              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) SOM

              - variscite,var-som-mx8mm   # i.MX8MM Variscite VAR-SOM-MX8MM module

          - const: fsl,imx8mm

Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
      - items:

          - enum:

              - linksys,nslu2

              - welltech,epbx100

          - const: intel,ixp42x

      - items:

          - enum:

Documentation/devicetree/bindings/arm/mediatek.yaml

+27 −2
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ properties: 
          - enum:

              - mediatek,mt8195-evb

          - const: mediatek,mt8195

      - description: Google Burnet (HP Chromebook x360 11MK G3 EE)

        items:

          - const: google,burnet

          - const: mediatek,mt8183

      - description: Google Krane (Lenovo IdeaPad Duet, 10e,...)

        items:

          - enum:
@@ -133,9 +137,19 @@ properties: 
        items:

          - const: google,damu

          - const: mediatek,mt8183

      - description: Google Juniper (Acer Chromebook Spin 311)

      - description: Google Fennel (Lenovo IdeaPad 3 Chromebook)

        items:

          - enum:

              - google,fennel-sku0

              - google,fennel-sku1

              - google,fennel-sku6

          - const: google,fennel

          - const: mediatek,mt8183

      - description: Google Juniper (Acer Chromebook Spin 311) / Kenzo (Acer Chromebook 311)

        items:

          - const: google,juniper-sku16

          - enum:

              - google,juniper-sku16

              - google,juniper-sku17

          - const: google,juniper

          - const: mediatek,mt8183

      - description: Google Kakadu (ASUS Chromebook Detachable CM3)
@@ -144,6 +158,10 @@ properties: 
          - const: google,kakadu-rev2

          - const: google,kakadu

          - const: mediatek,mt8183

      - description: Google Kappa (HP Chromebook 11a)

        items:

          - const: google,kappa

          - const: mediatek,mt8183

      - description: Google Kodama (Lenovo 10e Chromebook Tablet)

        items:

          - enum:
@@ -153,6 +171,13 @@ properties: 
              - google,kodama-sku32

          - const: google,kodama

          - const: mediatek,mt8183

      - description: Google Willow (Acer Chromebook 311 C722/C722T)

        items:

          - enum:

              - google,willow-sku0

              - google,willow-sku1

          - const: google,willow

          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8183-pumpkin