Unverified Commit 34b84ce9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

STM32 DT for v6.3, round 1

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

- MPU:
  - ST boards:
    - Add following peripherals support on stm32mp13:
      i2s, SAI, SPDIFRX, DFSDM, Timers
    - Add timers support on stm32mp135f-dk board.
    - Add decicated BSEC compatible on STM32MP13.
    - Rename sound card on STM32MP15 DKx.
    - Fix yaml validation issues.

* tag 'stm32-dt-for-v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: fix compatible for BSEC on STM32MP13
  ARM: dts: stm32: Update part number NVMEM description on stm32mp131
  ARM: dts: stm32: Use new media bus type macros
  ARM: dts: stm32: Fix User button on stm32mp135f-dk
  ARM: dts: stm32: add timers support on stm32mp135f-dk
  ARM: dts: stm32: add timer pins muxing for stm32mp135f-dk
  ARM: dts: stm32: add timers support on stm32mp131
  ARM: dts: stm32: add dfsdm node on stm32mp131
  ARM: dts: stm32: add spdifrx node on stm32mp131
  ARM: dts: stm32: add sai nodes on stm32mp131
  ARM: dts: stm32: add i2s nodes on stm32mp131
  ARM: dts: stm32: Remove the pins-are-numbered property
  ARM: dts: stm32: rename sound card on stm32mp15xx-dkx
  ARM: dts: stm32: remove sai kernel clock on stm32mp15xx-dkx
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som

Link: https://lore.kernel.org/r/3e815504-e85e-cbd3-6e6d-4e5a7aa7469a@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eacef7cc 7e1790d2

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

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "stm32f429-pinctrl.dtsi"

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/media/video-interfaces.h>



/ {

	model = "STMicroelectronics STM32429i-EVAL board";
@@ -186,7 +187,7 @@ &dcmi { 
	port {

		dcmi_0: endpoint {

			remote-endpoint = <&ov2640_0>;

			bus-type = <5>;

			bus-type = <MEDIA_BUS_TYPE_PARALLEL>;

			bus-width = <8>;

			hsync-active = <0>;

			vsync-active = <0>;

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

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ pinctrl: pinctrl@40020000 { 
			ranges = <0 0x40020000 0x3000>;

			interrupt-parent = <&exti>;

			st,syscfg = <&syscfg 0x8>;

			pins-are-numbered;



			gpioa: gpio@40020000 {

				gpio-controller;

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ pinctrl: pinctrl@40020000 { 
			ranges = <0 0x40020000 0x3000>;

			interrupt-parent = <&exti>;

			st,syscfg = <&syscfg 0x8>;

			pins-are-numbered;



			gpioa: gpio@40020000 {

				gpio-controller;

arch/arm/boot/dts/stm32h743.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -588,7 +588,6 @@ pinctrl: pinctrl@58020000 { 
			ranges = <0 0x58020000 0x3000>;

			interrupt-parent = <&exti>;

			st,syscfg = <&syscfg 0x8>;

			pins-are-numbered;



			gpioa: gpio@58020000 {

				gpio-controller;

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

+60 −0
Original line number Diff line number Diff line
@@ -54,6 +54,66 @@ pins { 
		};

	};



	pwm3_pins_a: pwm3-0 {

		pins {

			pinmux = <STM32_PINMUX('B', 1, AF2)>; /* TIM3_CH4 */

			bias-pull-down;

			drive-push-pull;

			slew-rate = <0>;

		};

	};



	pwm3_sleep_pins_a: pwm3-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('B', 1, ANALOG)>; /* TIM3_CH4 */

		};

	};



	pwm4_pins_a: pwm4-0 {

		pins {

			pinmux = <STM32_PINMUX('D', 13, AF2)>; /* TIM4_CH2 */

			bias-pull-down;

			drive-push-pull;

			slew-rate = <0>;

		};

	};



	pwm4_sleep_pins_a: pwm4-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('D', 13, ANALOG)>; /* TIM4_CH2 */

		};

	};



	pwm8_pins_a: pwm8-0 {

		pins {

			pinmux = <STM32_PINMUX('E', 5, AF3)>; /* TIM8_CH3 */

			bias-pull-down;

			drive-push-pull;

			slew-rate = <0>;

		};

	};



	pwm8_sleep_pins_a: pwm8-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('E', 5, ANALOG)>; /* TIM8_CH3 */

		};

	};



	pwm14_pins_a: pwm14-0 {

		pins {

			pinmux = <STM32_PINMUX('F', 9, AF9)>; /* TIM14_CH1 */

			bias-pull-down;

			drive-push-pull;

			slew-rate = <0>;

		};

	};



	pwm14_sleep_pins_a: pwm14-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('F', 9, ANALOG)>; /* TIM14_CH1 */

		};

	};



	sdmmc1_b4_pins_a: sdmmc1-b4-0 {

		pins {

			pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */