Commit 1b036162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more SoC devicetree updates from Arnd Bergmann:
 "This is a follow-up to an earlier pull request for device tree
  changes, as three platform maintainers sent their contents too late to
  be included in the main set, but had not caused any further problems
  since then:

   - The Amlogic platform now containts support for two new SoC types,
     the A4 and A5 chips for audio applications. Both come with a
     reference board, and one more dts file gets addded for the
     combination of the MNT Reform Laptop with the BPI-CM4 CPU module

   - The ASpeed platform adds support for six addititional server
     platforms that use ast2500 or ast2600 as their BMC, while another
     one gets removed

   - The RISC-V platforms from Microchip, Starfive and and T-HEAD get
     additional features for existing hardware, plus the addition of the
     Milk-V Mars based on the StarFive VisionFive v2 board"

* tag 'soc-dt-late-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (76 commits)
  riscv: dts: microchip: add pac1934 power-monitor to icicle
  riscv: dts: thead: Fix node ordering in TH1520 device tree
  ARM: dts: aspeed: Add ASRock E3C256D4I BMC
  dt-bindings: arm: aspeed: document ASRock E3C256D4I
  dt-bindings: trivial-devices: add isil,isl69269
  ARM: dts: aspeed: x4tf: Add dts for asus x4tf project
  dt-bindings: arm: aspeed: add ASUS X4TF board
  ARM: dts: aspeed: Remove Facebook Cloudripper dts
  ARM: dts: aspeed: drop unused ref_voltage ADC property
  ARM: dts: aspeed: harma: correct Mellanox multi-host property
  ARM: dts: aspeed: yosemitev2: correct Mellanox multi-host property
  ARM: dts: aspeed: yosemite4: correct Mellanox multi-host property
  ARM: dts: aspeed: greatlakes: correct Mellanox multi-host property
  ARM: dts: aspeed: Modify I2C bus configuration
  ARM: dts: aspeed: Disable unused ADC channels for Asrock X570D4U BMC
  ARM: dts: aspeed: Modify GPIO table for Asrock X570D4U BMC
  ARM: dts: aspeed: yosemite4: set bus13 frequency to 100k
  ARM: dts: Aspeed: Bonnell: Fix NVMe LED labels
  ARM: dts: aspeed: yosemite4: Enable ipmb device for OCP debug card
  ARM: dts: aspeed: ahe50dc: Update lm25066 regulator name
  ...
parents 30aec6e1 01a7f9e1

Documentation/devicetree/bindings/arm/amlogic.yaml

+13 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ properties: 
        items:

          - enum:

              - bananapi,bpi-cm4io

              - mntre,reform2-cm4

          - const: bananapi,bpi-cm4

          - const: amlogic,a311d

          - const: amlogic,g12b
@@ -201,6 +202,18 @@ properties: 
              - amlogic,ad402

          - const: amlogic,a1



      - description: Boards with the Amlogic A4 A113L2 SoC

        items:

          - enum:

              - amlogic,ba400

          - const: amlogic,a4



      - description: Boards with the Amlogic A5 A113X2 SoC

        items:

          - enum:

              - amlogic,av400

          - const: amlogic,a5



      - description: Boards with the Amlogic C3 C302X/C308L SoC

        items:

          - enum:

Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml

+6 −0
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ properties: 
              - ampere,mtjade-bmc

              - aspeed,ast2500-evb

              - asrock,e3c246d4i-bmc

              - asrock,e3c256d4i-bmc

              - asrock,romed8hm3-bmc

              - asrock,spc621d8hm3-bmc

              - asrock,x570d4u-bmc

              - bytedance,g220a-bmc

              - facebook,cmm-bmc

              - facebook,minipack-bmc
@@ -74,15 +77,18 @@ properties: 
              - ampere,mtmitchell-bmc

              - aspeed,ast2600-evb

              - aspeed,ast2600-evb-a1

              - asus,x4tf-bmc

              - facebook,bletchley-bmc

              - facebook,cloudripper-bmc

              - facebook,elbert-bmc

              - facebook,fuji-bmc

              - facebook,greatlakes-bmc

              - facebook,harma-bmc

              - facebook,minerva-cmc

              - facebook,yosemite4-bmc

              - ibm,everest-bmc

              - ibm,rainier-bmc

              - ibm,system1-bmc

              - ibm,tacoma-bmc

              - inventec,starscream-bmc

              - inventec,transformer-bmc

Documentation/devicetree/bindings/riscv/starfive.yaml

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


      - items:

          - enum:

              - milkv,mars

              - starfive,visionfive-2-v1.2a

              - starfive,visionfive-2-v1.3b

          - const: starfive,jh7110

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ properties: 
          - const: amlogic,meson-gx-uart

      - description: UART controller on S4 compatible SoCs

        items:

          - const: amlogic,t7-uart

          - enum:

              - amlogic,a4-uart

              - amlogic,t7-uart

          - const: amlogic,meson-s4-uart



  reg:

Documentation/devicetree/bindings/trivial-devices.yaml

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ properties: 
          - isil,isl29030

            # Intersil ISL68137 Digital Output Configurable PWM Controller

          - isil,isl68137

            # Intersil ISL69269 PMBus Voltage Regulator

          - isil,isl69269

            # Intersil ISL76682 Ambient Light Sensor

          - isil,isl76682

            # Linear Technology LTC2488