Unverified Commit aa2951a8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v6.6-1' of... 

Merge tag 'stm32-dt-for-v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into soc/dt

STM32 DT for v6.6, round 1

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

- MCU:
  - Add CAN support on stm32f746.
  - Add touchscreen support (edt-ft5306) on stm32f746-disco.
  - Add support to Rocktech RK043FN48H display on stm32f746-disco
    board.
  - Add gpio-ranges for stm32f7 to fix boot issue.

- MPU:
  - STM32MP13:
    - Remove shmem for scmi-optee to match with OP-TEE configuration.
    - Enable OP-TEE asynchronous notification by using PPI#15.
    - Expose and use SCMI regulators on stm32mp135f-dk.

  - STMP32MP15:
    - Remove shmem for scmi-optee to match with OPTEE configuration
    - Deduplicate DSI node to fix  #address-cells/#size-cells issue on
      boards using it.

  - ST:
    - Fix dts check warnings on stm32mp15-scmi boards.

  - DH:
    - Add missing detach mailbox for DHCOM and DHCOR SoM.

  - Odyssey:
    - Add missing detach mailbox for Odyssey SoM.

  - OCTAVO:
    - Add Linux Automation Test Automation Controller (LXA TAC) based
      on Octavo Systems OSD32MP15x SiP. It contains: eMMC,
      DSA-capable ETH switch (2 ports), dual CAN...
      It adds two boards support: lxa-tac-gen1 and lxa-tac-gen2 based
      on STM32MP157.

  - PROTONIC:
    - Add Power over Data Line (PoDL) Power Source Equipment (PSE)
      regulator nodes on PRTT1C board. It allows power delivery and
      data transmission over a single twisted pair.

* tag 'stm32-dt-for-v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (29 commits)
  ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board
  ARM: dts: stm32: STM32MP13x SoC exposes SCMI regulators
  dt-bindings: rcc: stm32: add STM32MP13 SCMI regulators IDs
  ARM: dts: stm32: support display on stm32f746-disco board
  ARM: dts: stm32: rename mmc_vcard to vcc-3v3 on stm32f746-disco
  ARM: dts: stm32: add pin map for LTDC on stm32f7
  ARM: dts: stm32: add ltdc support on stm32f746 MCU
  ARM: dts: st: Add gpio-ranges for stm32f769-pinctrl
  ARM: dts: st: Add gpio-ranges for stm32f746-pinctrl
  ARM: dts: st: stm32mp157c-emstamp: correct regulator-active-discharge
  ARM: dts: st: stm32mp157c-emstamp: drop incorrect vref_ddr property
  ARM: dts: stm32: fix dts check warnings on stm32mp15-scmi
  ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM
  ARM: dts: stm32: Add missing detach mailbox for DHCOM SoM
  ARM: dts: stm32: Add missing detach mailbox for Odyssey SoM
  ARM: dts: stm32: Add missing detach mailbox for emtrion emSBC-Argon
  ARM: dts: stm32: prtt1c: Add PoDL PSE regulator nodes
  ARM: dts: stm32: add touchscreen on stm32f746-disco board
  ARM: dts: stm32: add pin map for i2c3 controller on stm32f7
  ARM: dts: stm32: re-add CAN support on stm32f746
  ...

Link: https://lore.kernel.org/r/c0524a16-ab27-0cb5-8e7b-c12f7bde7e0d@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1298d0dd 4c757f6b

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

+3 −1
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ properties: 
        items:

          - enum:

              - lxa,stm32mp157c-mc1      # Linux Automation MC-1

              - lxa,stm32mp157c-tac-gen1 # Linux Automation TAC (Generation 1)

              - lxa,stm32mp157c-tac-gen2 # Linux Automation TAC (Generation 2)

          - const: oct,stm32mp15xx-osd32

          - enum:

              - st,stm32mp157

Documentation/devicetree/bindings/net/can/bosch,m_can.yaml

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ required: 
  - clock-names

  - bosch,mram-cfg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ properties: 
      Set if the output SYNCLKO clock should be disabled. Do not mix with

      microchip,synclko-125.



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

arch/arm/boot/dts/st/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ dtb-$(CONFIG_ARCH_STM32) += \ 
	stm32mp157c-ev1.dtb \

	stm32mp157c-ev1-scmi.dtb \

	stm32mp157c-lxa-mc1.dtb \

	stm32mp157c-lxa-tac-gen1.dtb \

	stm32mp157c-lxa-tac-gen2.dtb \

	stm32mp157c-odyssey.dtb \

	stm32mp157c-phycore-stm32mp1-3.dtb

dtb-$(CONFIG_ARCH_U8500) += \

arch/arm/boot/dts/st/stm32f7-pinctrl.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -171,6 +171,16 @@ 
				};

			};



			i2c3_pins_a: i2c3-0 {

				pins {

					pinmux = <STM32_PINMUX('H', 8, AF4)>, /* I2C3_SDA */

						 <STM32_PINMUX('H', 7, AF4)>; /* I2C3_SCL */

					bias-disable;

					drive-open-drain;

					slew-rate = <0>;

				};

			};



			usbotg_hs_pins_a: usbotg-hs-0 {

				pins {

					pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
@@ -365,6 +375,41 @@ 
					bias-pull-up;

				};

			};





			ltdc_pins_a: ltdc-0 {

				pins {

					pinmux = <STM32_PINMUX('E', 4, AF14)>, /* LCD_B0 */

						 <STM32_PINMUX('G',12, AF9)>,  /* LCD_B4 */

						 <STM32_PINMUX('I', 9, AF14)>, /* LCD_VSYNC */

						 <STM32_PINMUX('I',10, AF14)>, /* LCD_HSYNC */

						 <STM32_PINMUX('I',14, AF14)>, /* LCD_CLK */

						 <STM32_PINMUX('I',15, AF14)>, /* LCD_R0 */

						 <STM32_PINMUX('J', 0, AF14)>, /* LCD_R1 */

						 <STM32_PINMUX('J', 1, AF14)>, /* LCD_R2 */

						 <STM32_PINMUX('J', 2, AF14)>, /* LCD_R3 */

						 <STM32_PINMUX('J', 3, AF14)>, /* LCD_R4 */

						 <STM32_PINMUX('J', 4, AF14)>, /* LCD_R5 */

						 <STM32_PINMUX('J', 5, AF14)>, /* LCD_R6 */

						 <STM32_PINMUX('J', 6, AF14)>, /* LCD_R7 */

						 <STM32_PINMUX('J', 7, AF14)>, /* LCD_G0 */

						 <STM32_PINMUX('J', 8, AF14)>, /* LCD_G1 */

						 <STM32_PINMUX('J', 9, AF14)>, /* LCD_G2 */

						 <STM32_PINMUX('J',10, AF14)>, /* LCD_G3 */

						 <STM32_PINMUX('J',11, AF14)>, /* LCD_G4 */

						 <STM32_PINMUX('J',13, AF14)>, /* LCD_B1 */

						 <STM32_PINMUX('J',14, AF14)>, /* LCD_B2 */

						 <STM32_PINMUX('J',15, AF14)>, /* LCD_B3 */

						 <STM32_PINMUX('K', 0, AF14)>, /* LCD_G5 */

						 <STM32_PINMUX('K', 1, AF14)>, /* LCD_G6 */

						 <STM32_PINMUX('K', 2, AF14)>, /* LCD_G7 */

						 <STM32_PINMUX('K', 4, AF14)>, /* LCD_B5 */

						 <STM32_PINMUX('K', 5, AF14)>, /* LCD_B6 */

						 <STM32_PINMUX('K', 6, AF14)>, /* LCD_B7 */

						 <STM32_PINMUX('K', 7, AF14)>; /* LCD_DE */

					slew-rate = <2>;

				};

			};

		};

	};

};