Commit fcc3e3c3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v5.11-1' of...

Merge tag 'stm32-dt-for-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/dt

STM32 DT updates for v5.11, round 1

Highlights:
----------

MCU part:
 -Fix dmamux reg property (length) on stm32h743.
 -Explicitly set DCMI bus type on stm32429i eval board.

MPU part:
 -Enable FIFO mode with half-full threshold for DCMI.
 -Harmonize EHCI/OHCI nodes.
 -Move SDMMC IP version to v2.0 to get features improvements.
 -Add LP-timer wakeup support.
 -Enable crypto/hash/crc support.
 -Explicitly set DCMI bus type on stm32mp157 eval board.
 -Add USB type-c controller (STUSB1600) on stm32mp15 DK boards
  (It is connected to I2C4).
 -Fix dmamux reg property (length) on stm32mp151.
 -Optimize USB OTG FIFO sizes on stm32mp151.
 -Declare tamp node also as "simple-mfd".

 -LXA:
  -Document Octavo vendor-prefixes yaml file.
  -Document lxa,stm32mp157c-mc1 in STM32 yaml file.

 -DH:
  -Connect PHY IRQ line on DH SoM.
  -Add KS8851 Ethernet support on DHCOM which is mapped to FMC2.
  -Document all DH compatible strings in STM32 yaml file.
  -Add DHCOM based PicoITX board. This board embedds ethernet port,
   USB, CAN LEDS and a custom board-to-board connector.

* tag 'stm32-dt-for-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (34 commits)
  ARM: dts: stm32: lxa-mc1: add OSD32MP15x to list of compatibles
  dt-bindings: arm: stm32: add extra SiP compatible for lxa,stm32mp157c-mc1
  dt-bindings: vendor-prefixes: document Octavo Systems oct prefix
  ARM: dts: stm32: Add DHCOM based PicoITX board
  dt-bindings: arm: stm32: Add compatible strings for DH SoMs and boards
  ARM: dts: stm32: support child mfd cells for the stm32mp1 TAMP syscon
  dt-bindings: arm: stm32: add simple-mfd compatible for tamp node
  ARM: dts: stm32: update stm32mp151 for remote proc synchronization support
  ARM: dts: stm32: adjust USB OTG gadget fifo sizes in stm32mp151
  ARM: dts: stm32: fix dmamux reg property on stm32h743
  ARM: dts: stm32: fix dmamux reg property on stm32mp151
  ARM: dts: stm32: fix mdma1 clients channel priority level on stm32mp151
  ARM: dts: stm32: add STUSB1600 Type-C using I2C4 on stm32mp15xx-dkx
  dt-bindings: usb: Add DT bindings for STUSB160x Type-C controller
  dt-bindings: connector: add typec-power-opmode property to usb-connector
  ARM: dts: stm32: reorder spi4 within stm32mp15-pinctrl
  ARM: dts: stm32: set bus-type in DCMI endpoint for stm32429i-eval board
  ARM: dts: stm32: set bus-type in DCMI endpoint for stm32mp157c-ev1 board
  ARM: dts: stm32: enable CRYP by default on stm32mp15
  ARM: dts: stm32: enable CRC1 by default on stm32mp15
  ...

Link: https://lore.kernel.org/r/873c17a5-28d5-9261-f691-1b917611c932@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3a538406 6660e244
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ properties:
              - st,stm32-syscfg
              - st,stm32-power-config
          - const: syscon
      - items:
          - const: st,stm32-tamp
          - const: syscon
          - const: simple-mfd

  reg:
    maxItems: 1
+21 −2
Original line number Diff line number Diff line
@@ -14,6 +14,20 @@ properties:
    const: "/"
  compatible:
    oneOf:
      - description: DH STM32MP1 SoM based Boards
        items:
          - enum:
              - arrow,stm32mp157a-avenger96 # Avenger96
              - dh,stm32mp153c-dhcom-drc02
              - dh,stm32mp157c-dhcom-pdk2
              - dh,stm32mp157c-dhcom-picoitx
          - enum:
              - dh,stm32mp153c-dhcom-som
              - dh,stm32mp157a-dhcor-som
              - dh,stm32mp157c-dhcom-som
          - enum:
              - st,stm32mp153
              - st,stm32mp157
      - items:
          - enum:
              - st,stm32f429i-disco
@@ -39,8 +53,6 @@ properties:
          - const: st,stm32h743
      - items:
          - enum:
              - arrow,stm32mp157a-avenger96 # Avenger96
              - lxa,stm32mp157c-mc1
              - shiratech,stm32mp157a-iot-box # IoT Box
              - shiratech,stm32mp157a-stinger96 # Stinger96
              - st,stm32mp157c-ed1
@@ -52,6 +64,13 @@ properties:
          - const: st,stm32mp157c-ev1
          - const: st,stm32mp157c-ed1
          - const: st,stm32mp157
      - description: Octavo OSD32MP15x System-in-Package based boards
        items:
          - enum:
              - lxa,stm32mp157c-mc1 # Linux Automation MC-1
          - const: oct,stm32mp15xx-osd32
          - enum:
              - st,stm32mp157
      - description: Odyssey STM32MP1 SoM based Boards
        items:
          - enum:
+24 −0
Original line number Diff line number Diff line
@@ -93,6 +93,24 @@ properties:
      - device
      - dual

  typec-power-opmode:
    description: Determines the power operation mode that the Type C connector
      will support and will advertise through CC pins when it has no power
      delivery support.
      - "default" corresponds to default USB voltage and current defined by the
        USB 2.0 and USB 3.2 specifications, 5V 500mA for USB 2.0 ports and
        5V 900mA or 1500mA for USB 3.2 ports in single-lane or dual-lane
        operation respectively.
      - "1.5A" and "3.0A", 5V 1.5A and 5V 3.0A respectively, as defined in USB
        Type-C Cable and Connector specification, when Power Delivery is not
        supported.
    allOf:
      - $ref: /schemas/types.yaml#definitions/string
    enum:
      - default
      - 1.5A
      - 3.0A

  # The following are optional properties for "usb-c-connector" with power
  # delivery support.
  source-pdos:
@@ -173,6 +191,12 @@ allOf:
        type:
          const: micro

anyOf:
  - not:
      required:
        - typec-power-opmode
        - new-source-frs-typec-current

additionalProperties: true

examples:
+87 −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/usb/st,stusb160x.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"

title: STMicroelectronics STUSB160x Type-C controller bindings

maintainers:
  - Amelie Delaunay <amelie.delaunay@st.com>

properties:
  compatible:
    enum:
      - st,stusb1600

  reg:
    maxItems: 1

  interrupts:
    maxItems: 1

  vdd-supply:
    description: main power supply (4.1V-22V)

  vsys-supply:
    description: low power supply (3.0V-5.5V)

  vconn-supply:
    description: power supply (2.7V-5.5V) used to supply VConn on CC pin in
      source or dual power role

  connector:
    type: object

    allOf:
      - $ref: ../connector/usb-connector.yaml

    properties:
      compatible:
        const: usb-c-connector

      power-role: true

      typec-power-opmode: true

    required:
      - compatible

required:
  - compatible
  - reg
  - connector

additionalProperties: false

examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
    i2c4 {
        #address-cells = <1>;
        #size-cells = <0>;

        typec: stusb1600@28 {
            compatible = "st,stusb1600";
            reg = <0x28>;
            vdd-supply = <&vbus_drd>;
            vsys-supply = <&vdd_usb>;
            interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
            interrupt-parent = <&gpioi>;

            typec_con: connector {
                compatible = "usb-c-connector";
                label = "USB-C";
                power-role = "dual";
                data-role = "dual";
                typec-power-opmode = "default";

                port {
                    typec_con_ep: endpoint {
                        remote-endpoint = <&usbotg_hs_ep>;
                    };
                };
            };
        };
    };
...
+2 −0
Original line number Diff line number Diff line
@@ -760,6 +760,8 @@ patternProperties:
    description: NXP Semiconductors
  "^oceanic,.*":
    description: Oceanic Systems (UK) Ltd.
  "^oct,.*":
    description: Octavo Systems LLC
  "^okaya,.*":
    description: Okaya Electric America, Inc.
  "^oki,.*":
Loading