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

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

Pull ARM SoC devicetree updates from Arnd Bergmann:
 "As usual, this is the bulk of the updates for the SoC tree, adding
  more devices to existing files, addressing issues from ever improving
  automated checking, and fixing minor issues.

  The most interesting bits as usual are the new platforms. All the
  newly supported SoCs belong into existing families this time:

   - Qualcomm gets support for two newly announced platforms, both of
     which can now work in production environments: the SDX65 5G modem
     that can run a minimal Linux on its Cortex-A7 core, and the
     Snapdragon 8 Gen 1, their latest high-end phone SoC.

   - Renesas adds support for R-Car S4-8, the most recent automotive
     Server/Communication SoC.

   - TI adds support for J721s2, a new automotive SoC in the K3 family.

   - Mediatek MT7986a/b is a SoC used in Wifi routers, the latest
     generation following their popular MT76xx series. Only basic
     support is added for now.

   - NXP i.MX8 ULP8 is a new low-power variant of the widespread i.MX8
     series.

   - TI SPEAr320s is a minor variant of the old SPEAr320 SoC that we
     have supported for a long time.

  New boards with the existing SoCs include

   - Aspeed AST2500/AST2600 BMCs in TYAN, Facebook and Yadro servers

   - AT91/SAMA5 based evaluation board

   - NXP gains twenty new development and industrial boards for their
     i.MX and Layerscape SoCs

   - Intel IXP4xx now supports the final two machines in device tree
     that were previously only supported in old style board files.

   - Mediatek MT6589 is used in the Fairphone FP1 phone from 2013, while
     MT8183 is used in the Acer Chromebook 314.

   - Qualcomm gains support for the reference machines using the two new
     SoCs, plus a number of Chromebook variants and phones based on the
     Snapdragon 7c, 845 and 888 SoCs, including various Sony Xperia
     devices and the Microsoft Surface Duo 2.

   - ST STM32 now supports the Engicam i.Core STM32MP1 carrier board.

   - Tegra now boots various older Android devices based on 32-bit chips
     out of the box, including a number of ASUS Transformer tablets.

     There is also a new Jetson AGX Orin developer kit.

   - Apple support adds the missing device trees for all the remaining
     M1 Macbook and iMac variants, though not yet the M1 Pro/Max
     versions.

   - Allwinner now supports another version of the Tanix TX6 set-top box
     based on the H6 SoC.

   - Broadcom gains support for the Netgear RAXE500 Wireless router
     based on BCM4908"

* tag 'dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (574 commits)
  Revert "ARM: dts: BCM5301X: define RTL8365MB switch on Asus RT-AC88U"
  arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX
  arm64: dts: qcom: sm8450-qrd: Enable USB nodes
  arm64: dts: qcom: sm8450: Add usb nodes
  ARM: dts: aspeed: add LCLK setting into LPC KCS nodes
  dt-bindings: ipmi: bt-bmc: add 'clocks' as a required property
  ARM: dts: aspeed: add LCLK setting into LPC IBT node
  ARM: dts: aspeed: p10: Add TPM device
  ARM: dts: aspeed: p10: Enable USB host ports
  ARM: dts: aspeed: Add TYAN S8036 BMC machine
  ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config
  ARM: dts: aspeed: Adding Facebook Bletchley BMC
  ARM: dts: aspeed: g220a: Enable secondary flash
  ARM: dts: Add openbmc-flash-layout-64-alt.dtsi
  ARM: dts: aspeed: Add secure boot controller node
  dt-bindings: aspeed: Add Secure Boot Controller bindings
  ARM: dts: Remove "spidev" nodes
  dt-bindings: pinctrl: samsung: Add pin drive definitions for Exynos850
  dt-bindings: arm: samsung: Document E850-96 board binding
  dt-bindings: Add vendor prefix for WinLink
  ...
parents e85195d5 8b0c59c6

Documentation/devicetree/bindings/arm/apple.yaml

+25 −2
Original line number Diff line number Diff line
@@ -12,12 +12,19 @@ maintainers: 
description: |

  ARM platforms using SoCs designed by Apple Inc., branded "Apple Silicon".



  This currently includes devices based on the "M1" SoC, starting with the

  three Mac models released in late 2020:

  This currently includes devices based on the "M1" SoC:



  - Mac mini (M1, 2020)

  - MacBook Pro (13-inch, M1, 2020)

  - MacBook Air (M1, 2020)

  - iMac (24-inch, M1, 2021)



  And devices based on the "M1 Pro" and "M1 Max" SoCs:



  - MacBook Pro (14-inch, M1 Pro, 2021)

  - MacBook Pro (14-inch, M1 Max, 2021)

  - MacBook Pro (16-inch, M1 Pro, 2021)

  - MacBook Pro (16-inch, M1 Max, 2021)



  The compatible property should follow this format:
@@ -56,8 +63,24 @@ properties: 
              - apple,j274 # Mac mini (M1, 2020)

              - apple,j293 # MacBook Pro (13-inch, M1, 2020)

              - apple,j313 # MacBook Air (M1, 2020)

              - apple,j456 # iMac (24-inch, 4x USB-C, M1, 2021)

              - apple,j457 # iMac (24-inch, 2x USB-C, M1, 2021)

          - const: apple,t8103

          - const: apple,arm-platform

      - description: Apple M1 Pro SoC based platforms

        items:

          - enum:

              - apple,j314s # MacBook Pro (14-inch, M1 Pro, 2021)

              - apple,j316s # MacBook Pro (16-inch, M1 Pro, 2021)

          - const: apple,t6000

          - const: apple,arm-platform

      - description: Apple M1 Max SoC based platforms

        items:

          - enum:

              - apple,j314c # MacBook Pro (14-inch, M1 Max, 2021)

              - apple,j316c # MacBook Pro (16-inch, M1 Max, 2021)

          - const: apple,t6001

          - const: apple,arm-platform



additionalProperties: true

Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml

0 → 100644
+134 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/apple/apple,pmgr.yaml#

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



title: Apple SoC Power Manager (PMGR)



maintainers:

  - Hector Martin <marcan@marcan.st>



description: |

  Apple SoCs include PMGR blocks responsible for power management,

  which can control various clocks, resets, power states, and

  performance features. This node represents the PMGR as a syscon,

  with sub-nodes representing individual features.



properties:

  $nodename:

    pattern: "^power-management@[0-9a-f]+$"



  compatible:

    items:

      - enum:

          - apple,t8103-pmgr

          - apple,t6000-pmgr

      - const: apple,pmgr

      - const: syscon

      - const: simple-mfd



  reg:

    maxItems: 1



  "#address-cells":

    const: 1



  "#size-cells":

    const: 1



patternProperties:

  "power-controller@[0-9a-f]+$":

    description:

      The individual power management domains within this controller

    type: object

    $ref: /power/apple,pmgr-pwrstate.yaml#



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        power-management@23b700000 {

            compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";

            #address-cells = <1>;

            #size-cells = <1>;

            reg = <0x2 0x3b700000 0x0 0x14000>;



            ps_sio: power-controller@1c0 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x1c0 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "sio";

                apple,always-on;

            };



            ps_uart_p: power-controller@220 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x220 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "uart_p";

                power-domains = <&ps_sio>;

            };



            ps_uart0: power-controller@270 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x270 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "uart0";

                power-domains = <&ps_uart_p>;

            };

        };



        power-management@23d280000 {

            compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";

            #address-cells = <1>;

            #size-cells = <1>;

            reg = <0x2 0x3d280000 0x0 0xc000>;



            ps_aop_filter: power-controller@4000 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x4000 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "aop_filter";

            };



            ps_aop_base: power-controller@4010 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x4010 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "aop_base";

                power-domains = <&ps_aop_filter>;

            };



            ps_aop_shim: power-controller@4038 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x4038 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "aop_shim";

                power-domains = <&ps_aop_base>;

            };



            ps_aop_uart0: power-controller@4048 {

                compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";

                reg = <0x4048 8>;

                #power-domain-cells = <0>;

                #reset-cells = <0>;

                label = "aop_uart0";

                power-domains = <&ps_aop_shim>;

            };

        };

    };

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)

# Copyright 2021 Joel Stanley, IBM Corp.

%YAML 1.2

---

$id: "http://devicetree.org/schemas/arm/aspeed/aspeed,sbc.yaml#"

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



title: ASPEED Secure Boot Controller



maintainers:

  - Joel Stanley <joel@jms.id.au>

  - Andrew Jeffery <andrew@aj.id.au>



description: |

  The ASPEED SoCs have a register bank for interacting with the secure boot

  controller.



properties:

  compatible:

    items:

      - const: aspeed,ast2600-sbc



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    sbc: secure-boot-controller@1e6f2000 {

            compatible = "aspeed,ast2600-sbc";

            reg = <0x1e6f2000 0x1000>;

    };

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml

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

          - enum:

              - asus,gt-ac5300

              - netgear,raxe500

          - const: brcm,bcm4908



      - description: BCM49408 based boards

Documentation/devicetree/bindings/arm/fsl.yaml

+78 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ properties: 
              - uniwest,imx6q-evi         # Uniwest Evi

              - variscite,dt6customboard

              - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board

              - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board

              - zealz,imx6q-gk802         # Zealz GK802

              - zii,imx6q-zii-rdu2        # ZII RDU2 Board

          - const: fsl,imx6q
@@ -323,6 +324,20 @@ properties: 
          - const: toradex,apalis_imx6q

          - const: fsl,imx6q



      - description: TQ-Systems TQMa6Q SoM (variant A) on MBa6x

        items:

          - const: tq,imx6q-mba6x-a

          - const: tq,mba6a               # Expected by bootloader, to be removed in the future

          - const: tq,imx6q-tqma6q-a

          - const: fsl,imx6q



      - description: TQ-Systems TQMa6Q SoM (variant B) on MBa6x

        items:

          - const: tq,imx6q-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6q-tqma6q-b

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -334,6 +349,7 @@ properties: 
              - kvg,vicutp                # Kverneland UT1P board

              - prt,prtwd3                # Protonic WD3 board

              - wand,imx6qp-wandboard     # Wandboard i.MX6 QuadPlus Board

              - ysoft,imx6qp-yapp4-crux-plus  # i.MX6 Quad Plus Y Soft IOTA Crux+ board

              - zii,imx6qp-zii-rdu2       # ZII RDU2+ Board

          - const: fsl,imx6qp
@@ -344,6 +360,13 @@ properties: 
          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6qp



      - description: TQ-Systems TQMa6QP SoM on MBa6x

        items:

          - const: tq,imx6qp-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6qp-tqma6qp-b

          - const: fsl,imx6qp



      - description: i.MX6DL based Boards

        items:

          - enum:
@@ -482,6 +505,20 @@ properties: 
          - const: dh,imx6s-dhcom-som

          - const: fsl,imx6dl



      - description: TQ-Systems TQMa6DL SoM (variant A) on MBa6x

        items:

          - const: tq,imx6dl-mba6x-a

          - const: tq,mba6a               # Expected by bootloader, to be removed in the future

          - const: tq,imx6dl-tqma6dl-a

          - const: fsl,imx6dl



      - description: TQ-Systems TQMa6DL SoM (variant B) on MBa6x

        items:

          - const: tq,imx6dl-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6dl-tqma6dl-b

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:
@@ -580,6 +617,7 @@ properties: 
        items:

          - enum:

              - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board

              - joz,jozacp                # JOZ Access Point

              - kontron,imx6ull-n6411-som # Kontron N6411 SOM

              - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board

              - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules
@@ -632,6 +670,7 @@ properties: 
      - description: i.MX6ULZ based Boards

        items:

          - enum:

              - bsh,imx6ulz-bsh-smm-m2    # i.MX6 ULZ BSH SystemMaster

              - fsl,imx6ulz-14x14-evk     # i.MX6 ULZ 14x14 EVK Board

          - const: fsl,imx6ull # This seems odd. Should be last?

          - const: fsl,imx6ulz
@@ -754,10 +793,23 @@ properties: 
          - const: variscite,var-som-mx8mm

          - const: fsl,imx8mm



      - description:

          TQMa8MxML is a series of SOM featuring NXP i.MX8MM system-on-chip

          variants. It is designed to be soldered on different carrier boards.

          All variants (TQMa8M[Q,D,S][L]ML) use the same device tree, hence only

          one compatible is needed.

        items:

          - enum:

              - tq,imx8mm-tqma8mqml-mba8mx # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM on MBa8Mx

          - const: tq,imx8mm-tqma8mqml     # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM

          - const: fsl,imx8mm



      - description: i.MX8MN based Boards

        items:

          - enum:

              - beacon,imx8mn-beacon-kit  # i.MX8MN Beacon Development Kit

              - bsh,imx8mn-bsh-smm-s2     # i.MX8MN BSH SystemMaster S2

              - bsh,imx8mn-bsh-smm-s2pro  # i.MX8MN BSH SystemMaster S2 PRO

              - fsl,imx8mn-ddr4-evk       # i.MX8MN DDR4 EVK Board

              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

              - gw,imx8mn-gw7902          # i.MX8MM Gateworks Board
@@ -769,6 +821,17 @@ properties: 
          - const: variscite,var-som-mx8mn

          - const: fsl,imx8mn



      - description:

          TQMa8MxNL is a series of SOM featuring NXP i.MX8MN system-on-chip

          variants. It is designed to be soldered on different carrier boards.

          All variants (TQMa8M[Q,D,S][L]NL) use the same device tree, hence only

          one compatible is needed.

        items:

          - enum:

              - tq,imx8mn-tqma8mqnl-mba8mx # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM on MBa8Mx

          - const: tq,imx8mn-tqma8mqnl     # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM

          - const: fsl,imx8mn



      - description: i.MX8MP based Boards

        items:

          - enum:
@@ -805,6 +868,15 @@ properties: 
          - const: purism,librem5

          - const: fsl,imx8mq



      - description:

          TQMa8Mx is a series of SOM featuring NXP i.MX8MQ system-on-chip

          variants. It is designed to be clicked on different carrier boards.

        items:

          - enum:

              - tq,imx8mq-tqma8mq-mba8mx # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM on MBa8Mx

          - const: tq,imx8mq-tqma8mq     # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM

          - const: fsl,imx8mq



      - description: Zodiac Inflight Innovations Ultra Boards

        items:

          - enum:
@@ -834,6 +906,12 @@ properties: 
          - const: toradex,colibri-imx8x

          - const: fsl,imx8qxp



      - description: i.MX8ULP based Boards

        items:

          - enum:

              - fsl,imx8ulp-evk           # i.MX8ULP EVK Board

          - const: fsl,imx8ulp



      - description:

          Freescale Vybrid Platform Device Tree Bindings