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

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

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

STM32 DT updates for v5.9, round 1

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

MCU part:
 -Enable stmpe811 on stm32f429
 -Enable l3gd20-gyro on stm32f429
 -Enable panel-ilitek-9341 on stm32f429
 -Fixes for yaml validation (leds, nodes names,
  remove useless bindings ...)
 -Add stm32xxx compatibles for syscon nodes

MPU part:
 -Add support for usb role switch to dwc2
 -Add stm32xxx compatibles for syscon nodes
 -Update uart4 pin configuration for low power mode
  used by dkx and ed1 ST boards
 -Fix uart nodes ordering and uart7_pins_a comments
 -Add the support of uart instances available on STM32MP157 boards:
  - usart3 on stm32mp157c-ev1, stm32mp157a-dk1, and stm32mp157c-dk2
  - uart7 on stm32mp157a-dk1 and stm32mp157c-dk2
  - usart2 on stm32mp157c-dk2
 -Configure I2C5 on stm32mp15 DK boards

* tag 'stm32-dt-for-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (38 commits)
  ARM: dts: stm32: enable usb-role-switch on USB OTG on stm32mp15xx-dkx
  ARM: dts: stm32: Add compatibles for syscon for stm32mp151
  ARM: dts: stm32: Add compatibles for syscon for stm32h743
  ARM: dts: stm32: Add compatibles for syscon for stm32f746
  ARM: dts: stm32: Add compatibles for syscon for stm32f426
  dt-bindings: arm: stm32: Add compatibles for syscon nodes
  ARM: dts: stm32: Fix spi4 pins in stm32mp15-pinctrl
  ARM: dts: stm32: configure i2c5 support on stm32mp15xx-dkx
  ARM: dts: stm32: add usart2 node to stm32mp157c-dk2
  ARM: dts: stm32: add uart7 support to stm32mp15xx-dkx boards
  ARM: dts: stm32: add usart3 node to stm32mp157c-ev1
  ARM: dts: stm32: add usart3 node to stm32mp15xx-dkx boards
  ARM: dts: stm32: add usart2, usart3 and uart7 pins in stm32mp15-pinctrl
  ARM: dts: stm32: cosmetic updates in stm32mp15-pinctrl
  ARM: dts: stm32: fix uart7_pins_a comments in stm32mp15-pinctrl
  ARM: dts: stm32: fix uart nodes ordering in stm32mp15-pinctrl
  ARM: dts: stm32: Update UART4 pin states on stm32mp15xx-dkx
  ARM: dts: stm32: Update pin states for uart4 on stm32mp157c-ed1
  ARM: dts: stm32: update uart4 pin configuration for low power on stm32mp157
  dt-bindings: usb: dwc2: Fix issues for stm32mp15x SoC
  ...

Link: https://lore.kernel.org/r/8a9bb27b-fc08-126a-11f7-01354e8577e1@st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bd979a33 d9b6b515

Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml

+13 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ properties: 
      - items:

          - enum:

              - st,stm32mp157-syscfg

              - st,stm32mp151-pwr-mcu

              - st,stm32-syscfg

              - st,stm32-power-config

          - const: syscon



  reg:
@@ -27,6 +30,15 @@ properties: 
required:

  - compatible

  - reg



if:

  properties:

    compatible:

      contains:

        enum:

          - st,stm32mp157-syscfg

then:

  required:

    - clocks



additionalProperties: false

Documentation/devicetree/bindings/usb/dwc2.yaml

+4 −2
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ properties: 
      - const: st,stm32f4x9-hsotg

      - const: st,stm32f7-hsotg

      - const: st,stm32mp15-fsotg

      - items:

          - const: st,stm32mp15-hsotg

          - const: snps,dwc2

      - const: samsung,s3c6400-hsotg



  reg:
@@ -93,7 +95,7 @@ properties: 
  vusb_a-supply:

    description: phandle to voltage regulator of analog section.



  vusb33d-supply:

  usb33d-supply:

    description: reference to the VBUS and ID sensing comparators supply, in

      order to perform OTG operation, used on STM32MP15 SoCs.

arch/arm/boot/dts/stm32429i-eval.dts

+5 −5
Original line number Diff line number Diff line
@@ -104,17 +104,17 @@ 


	leds {

		compatible = "gpio-leds";

		green {

		led-green {

			gpios = <&gpiog 6 1>;

			linux,default-trigger = "heartbeat";

		};

		orange {

		led-orange {

			gpios = <&gpiog 7 1>;

		};

		red {

		led-red {

			gpios = <&gpiog 10 1>;

		};

		blue {

		led-blue {

			gpios = <&gpiog 12 1>;

		};

	};
@@ -240,7 +240,7 @@ 


&ltdc {

	status = "okay";

	pinctrl-0 = <&ltdc_pins>;

	pinctrl-0 = <&ltdc_pins_a>;

	pinctrl-names = "default";



	port {

arch/arm/boot/dts/stm32746g-eval.dts

+4 −4
Original line number Diff line number Diff line
@@ -66,17 +66,17 @@ 


	leds {

		compatible = "gpio-leds";

		green {

		led-green {

			gpios = <&gpiof 10 1>;

			linux,default-trigger = "heartbeat";

		};

		orange {

		led-orange {

			gpios = <&stmfx_pinctrl 17 1>;

		};

		red {

		led-red {

			gpios = <&gpiob 7 1>;

		};

		blue {

		led-blue {

			gpios = <&stmfx_pinctrl 19 1>;

		};

	};

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

+82 −3
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ 
				};

			};



			pwm1_pins: pwm-1 {

			pwm1_pins: pwm1-0 {

				pins {

					pinmux = <STM32_PINMUX('A', 8, AF1)>, /* TIM1_CH1 */

						 <STM32_PINMUX('B', 13, AF1)>, /* TIM1_CH1N */
@@ -265,7 +265,7 @@ 
				};

			};



			pwm3_pins: pwm-3 {

			pwm3_pins: pwm3-0 {

				pins {

					pinmux = <STM32_PINMUX('B', 4, AF2)>, /* TIM3_CH1 */

						 <STM32_PINMUX('B', 5, AF2)>; /* TIM3_CH2 */
@@ -282,7 +282,7 @@ 
				};

			};



			ltdc_pins: ltdc-0 {

			ltdc_pins_a: ltdc-0 {

				pins {

					pinmux = <STM32_PINMUX('I', 12, AF14)>, /* LCD_HSYNC */

						 <STM32_PINMUX('I', 13, AF14)>, /* LCD_VSYNC */
@@ -316,6 +316,85 @@ 
				};

			};



			ltdc_pins_b: ltdc-1 {

				pins {

					pinmux = <STM32_PINMUX('C', 6,  AF14)>,

						/* LCD_HSYNC */

						 <STM32_PINMUX('A', 4,  AF14)>,

						 /* LCD_VSYNC */

						 <STM32_PINMUX('G', 7,  AF14)>,

						 /* LCD_CLK */

						 <STM32_PINMUX('C', 10, AF14)>,

						 /* LCD_R2 */

						 <STM32_PINMUX('B', 0,  AF9)>,

						 /* LCD_R3 */

						 <STM32_PINMUX('A', 11, AF14)>,

						 /* LCD_R4 */

						 <STM32_PINMUX('A', 12, AF14)>,

						 /* LCD_R5 */

						 <STM32_PINMUX('B', 1,  AF9)>,

						 /* LCD_R6*/

						 <STM32_PINMUX('G', 6,  AF14)>,

						 /* LCD_R7 */

						 <STM32_PINMUX('A', 6,  AF14)>,

						 /* LCD_G2 */

						 <STM32_PINMUX('G', 10, AF9)>,

						 /* LCD_G3 */

						 <STM32_PINMUX('B', 10, AF14)>,

						 /* LCD_G4 */

						 <STM32_PINMUX('D', 6,  AF14)>,

						 /* LCD_B2 */

						 <STM32_PINMUX('G', 11, AF14)>,

						 /* LCD_B3*/

						 <STM32_PINMUX('B', 11, AF14)>,

						 /* LCD_G5 */

						 <STM32_PINMUX('C', 7,  AF14)>,

						 /* LCD_G6 */

						 <STM32_PINMUX('D', 3,  AF14)>,

						 /* LCD_G7 */

						 <STM32_PINMUX('G', 12, AF9)>,

						 /* LCD_B4 */

						 <STM32_PINMUX('A', 3,  AF14)>,

						 /* LCD_B5 */

						 <STM32_PINMUX('B', 8,  AF14)>,

						 /* LCD_B6 */

						 <STM32_PINMUX('B', 9,  AF14)>,

						 /* LCD_B7 */

						 <STM32_PINMUX('F', 10, AF14)>;

						 /* LCD_DE */

					slew-rate = <2>;

				};

			};



			spi5_pins: spi5-0 {

				pins1 {

					pinmux = <STM32_PINMUX('F', 7, AF5)>,

						/* SPI5_CLK */

						 <STM32_PINMUX('F', 9, AF5)>;

						/* SPI5_MOSI */

					bias-disable;

					drive-push-pull;

					slew-rate = <0>;

				};

				pins2 {

					pinmux = <STM32_PINMUX('F', 8, AF5)>;

						/* SPI5_MISO */

					bias-disable;

				};

			};



			i2c3_pins: i2c3-0 {

				pins {

					pinmux = <STM32_PINMUX('C', 9, AF4)>,

						/* I2C3_SDA */

						 <STM32_PINMUX('A', 8, AF4)>;

						/* I2C3_SCL */

					bias-disable;

					drive-open-drain;

					slew-rate = <3>;

				};

			};



			dcmi_pins: dcmi-0 {

				pins {

					pinmux = <STM32_PINMUX('A', 4, AF13)>, /* DCMI_HSYNC */

CRA Git | Maintained and supported by SUSTech CRA and CCSE