Unverified Commit 0fd8954b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

STM32 DT for v5.19, round 1

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

-MCU:
 -Fix pinctrl node names to match with pinctrl yaml.

- MPU:
 -General:
  - Fix pinctrl node names to match with pinctrl yaml.
  - Add Protonics boards support based on STM32MP151A SoC:
    - PRTT1C - 10BaseT1L switch: mainly embeds a sja1105q switch with
               TI and Micrel 10BaseT Phys and wifi support.
    - PRTT1S - 10BaseT1L CO2 sensor board: mainly embeds I2C humidity
               and CO2 sensors.
    - PRTT1A - 10BaseT1L multi functional controller.

 - ST boards:
  - Add RTC support on stm32mp13.
  - Add button and heartbit support on stm32mp13 DK board.
  - Add a secure version of STM32MP15 ED1/EV1/DK1/DK2 boards based
    on OP-TEE OS and SCMI protocol.

 - DH boards:
  - Use MCO2 to generate PHY clock and ETHRX clock in order to release
    internal PLL for a better SD card usage.
  - Add 1ms PHY post-reset on Avenger96 board to match with PHY
    requirements.

* tag 'stm32-dt-for-v5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (24 commits)
  ARM: dts: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)
  dt-bindings: arm: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)
  ARM: dts: stm32: enable optee firmware and SCMI support on STM32MP15
  dt-bindings: reset: stm32mp15: rename RST_SCMI define
  dt-bindings: clock: stm32mp15: rename CK_SCMI define
  dt-bindings: clock: stm32mp1: describes clocks if "st,stm32mp1-rcc-secure"
  dt-bindings: rcc: Add optional external ethernet RX clock properties
  ARM: dts: stm32: add UserPA13 button on stm32mp135f-dk
  ARM: dts: stm32: add blue led (Linux heartbeat) on stm32mp135f-dk
  ARM: dts: stm32: add EXTI interrupt-parent to pinctrl node on stm32mp131
  ARM: dts: stm32: add support for Protonic PRTT1x boards
  ARM: dts: stm32: stm32mp15-pinctrl: add spi1-1 pinmux group
  dt-bindings: net: silabs,wfx: add prt,prtt1c-wfm200 antenna variant
  dt-bindings: arm: stm32: Add compatible strings for Protonic T1L boards
  dt-bindings: arm: stm32: correct blank lines
  dt-bindings: arm: stm32: narrow DH STM32MP1 SoM boards
  ARM: dts: stm32: enable RTC support on stm32mp135f-dk
  ARM: dts: stm32: add RTC node on stm32mp131
  ARM: dts: stm32: Fix PHY post-reset delay on Avenger96
  ARM: dts: stm32: fix pinctrl node name warnings (MPU soc)
  ...

Link: https://lore.kernel.org/r/5818c943-882d-7e50-430d-ae3299a108ee@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 87f5bc6d 5b7e5831

Documentation/devicetree/bindings/arm/stm32/stm32.yaml

+48 −15
Original line number Diff line number Diff line
@@ -14,21 +14,6 @@ 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



      - description: emtrion STM32MP1 Argon based Boards

        items:

          - const: emtrion,stm32mp157c-emsbc-argon
@@ -65,6 +50,21 @@ properties: 
          - enum:

              - st,stm32mp135f-dk

          - const: st,stm32mp135



      - description: ST STM32MP151 based Boards

        items:

          - enum:

              - prt,prtt1a   # Protonic PRTT1A

              - prt,prtt1c   # Protonic PRTT1C

              - prt,prtt1s   # Protonic PRTT1S

          - const: st,stm32mp151



      - description: DH STM32MP153 SoM based Boards

        items:

          - const: dh,stm32mp153c-dhcom-drc02

          - const: dh,stm32mp153c-dhcom-som

          - const: st,stm32mp153



      - items:

          - enum:

              - shiratech,stm32mp157a-iot-box # IoT Box
@@ -72,13 +72,45 @@ properties: 
              - st,stm32mp157c-ed1

              - st,stm32mp157a-dk1

              - st,stm32mp157c-dk2

          - const: st,stm32mp157



      - items:

          - const: st,stm32mp157a-dk1-scmi

          - const: st,stm32mp157a-dk1

          - const: st,stm32mp157

      - items:

          - const: st,stm32mp157c-dk2-scmi

          - const: st,stm32mp157c-dk2

          - const: st,stm32mp157

      - items:

          - const: st,stm32mp157c-ed1-scmi

          - const: st,stm32mp157c-ed1

          - const: st,stm32mp157

      - items:

          - const: st,stm32mp157c-ev1

          - const: st,stm32mp157c-ed1

          - const: st,stm32mp157

      - items:

          - const: st,stm32mp157c-ev1-scmi

          - const: st,stm32mp157c-ev1

          - const: st,stm32mp157c-ed1

          - const: st,stm32mp157



      - description: DH STM32MP1 SoM based Boards

        items:

          - enum:

              - arrow,stm32mp157a-avenger96 # Avenger96

          - const: dh,stm32mp157a-dhcor-som

          - const: st,stm32mp157



      - description: DH STM32MP1 SoM based Boards

        items:

          - enum:

              - dh,stm32mp157c-dhcom-pdk2

              - dh,stm32mp157c-dhcom-picoitx

          - const: dh,stm32mp157c-dhcom-som

          - const: st,stm32mp157



      - description: Engicam i.Core STM32MP1 SoM based Boards

        items:

          - enum:
@@ -103,6 +135,7 @@ properties: 
          - const: oct,stm32mp15xx-osd32

          - enum:

              - st,stm32mp157



      - description: Odyssey STM32MP1 SoM based Boards

        items:

          - enum:

Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml

+34 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ properties: 
          - st,stm32mp1-rcc-secure

          - st,stm32mp1-rcc

      - const: syscon

  clocks: true

  clock-names: true



  reg:

    maxItems: 1
@@ -68,6 +70,38 @@ required: 
  - compatible

  - reg



if:

  properties:

    compatible:

      contains:

        enum:

          - st,stm32mp1-rcc-secure

then:

  properties:

    clocks:

      description: Specifies oscillators.

      maxItems: 5



    clock-names:

      items:

        - const: hse

        - const: hsi

        - const: csi

        - const: lse

        - const: lsi

  required:

    - clocks

    - clock-names

else:

  properties:

    clocks:

      description:

        Specifies the external RX clock for ethernet MAC.

      maxItems: 1



    clock-names:

      const: ETH_RX_CLK/ETH_REF_CLK



additionalProperties: false



examples:

Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml

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

    items:

      - enum:

          - prt,prtt1c-wfm200 # Protonic PRTT1C Board

          - silabs,brd4001a # WGM160P Evaluation Board

          - silabs,brd8022a # WF200 Evaluation Board

          - silabs,brd8023a # WFM200 Evaluation Board

arch/arm/boot/dts/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -1156,10 +1156,14 @@ dtb-$(CONFIG_ARCH_STM32) += \ 
	stm32h743i-disco.dtb \

	stm32h750i-art-pi.dtb \

	stm32mp135f-dk.dtb \

	stm32mp151a-prtt1a.dtb \

	stm32mp151a-prtt1c.dtb \

	stm32mp151a-prtt1s.dtb \

	stm32mp153c-dhcom-drc02.dtb \

	stm32mp157a-avenger96.dtb \

	stm32mp157a-dhcor-avenger96.dtb \

	stm32mp157a-dk1.dtb \

	stm32mp157a-dk1-scmi.dtb \

	stm32mp157a-iot-box.dtb \

	stm32mp157a-microgea-stm32mp1-microdev2.0.dtb \

	stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dtb \
@@ -1170,9 +1174,12 @@ dtb-$(CONFIG_ARCH_STM32) += \ 
	stm32mp157c-dhcom-pdk2.dtb \

	stm32mp157c-dhcom-picoitx.dtb \

	stm32mp157c-dk2.dtb \

	stm32mp157c-dk2-scmi.dtb \

	stm32mp157c-ed1.dtb \

	stm32mp157c-ed1-scmi.dtb \

	stm32mp157c-emsbc-argon.dtb \

	stm32mp157c-ev1.dtb \

	stm32mp157c-ev1-scmi.dtb \

	stm32mp157c-lxa-mc1.dtb \

	stm32mp157c-odyssey.dtb

dtb-$(CONFIG_MACH_SUN4I) += \

arch/arm/boot/dts/stm32f4-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


/ {

	soc {

		pinctrl: pin-controller@40020000 {

		pinctrl: pinctrl@40020000 {

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x40020000 0x3000>;