[PATCH] arm: dts: stm32mp15: alignment with v5.16

[Patrice CHOTARD]

Hi Patrick

On 12/17/21 16:30, Patrick Delaunay wrote:
> Device tree alignment with Linux kernel v5.16-rc5
> - ARM: dts: stm32: set otg-rev on stm32mp151
> - ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151
> - ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
> - ARM: dts: stm32: fix SAI sub nodes register range
> - ARM: dts: stm32: fix STUSB1600 Type-C irq level on stm32mp15xx-dkx
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  arch/arm/dts/stm32mp15-pinctrl.dtsi |  8 ++++----
>  arch/arm/dts/stm32mp151.dtsi        | 19 ++++++++++---------
>  arch/arm/dts/stm32mp15xx-dkx.dtsi   |  2 +-
>  3 files changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/arm/dts/stm32mp15-pinctrl.dtsi b/arch/arm/dts/stm32mp15-pinctrl.dtsi
> index 5b60ecbd71..d3553e0f01 100644
> --- a/arch/arm/dts/stm32mp15-pinctrl.dtsi
> +++ b/arch/arm/dts/stm32mp15-pinctrl.dtsi
> @@ -1179,7 +1179,7 @@
>  		};
>  	};
>  
> -	sai2a_pins_c: sai2a-4 {
> +	sai2a_pins_c: sai2a-2 {
>  		pins {
>  			pinmux = <STM32_PINMUX('D', 13, AF10)>, /* SAI2_SCK_A */
>  				 <STM32_PINMUX('D', 11, AF10)>, /* SAI2_SD_A */
> @@ -1190,7 +1190,7 @@
>  		};
>  	};
>  
> -	sai2a_sleep_pins_c: sai2a-5 {
> +	sai2a_sleep_pins_c: sai2a-sleep-2 {
>  		pins {
>  			pinmux = <STM32_PINMUX('D', 13, ANALOG)>, /* SAI2_SCK_A */
>  				 <STM32_PINMUX('D', 11, ANALOG)>, /* SAI2_SD_A */
> @@ -1235,14 +1235,14 @@
>  		};
>  	};
>  
> -	sai2b_pins_c: sai2a-4 {
> +	sai2b_pins_c: sai2b-2 {
>  		pins1 {
>  			pinmux = <STM32_PINMUX('F', 11, AF10)>; /* SAI2_SD_B */
>  			bias-disable;
>  		};
>  	};
>  
> -	sai2b_sleep_pins_c: sai2a-sleep-5 {
> +	sai2b_sleep_pins_c: sai2b-sleep-2 {
>  		pins {
>  			pinmux = <STM32_PINMUX('F', 11, ANALOG)>; /* SAI2_SD_B */
>  		};
> diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi
> index 8e0a0bc1dd..5a2be00758 100644
> --- a/arch/arm/dts/stm32mp151.dtsi
> +++ b/arch/arm/dts/stm32mp151.dtsi
> @@ -842,7 +842,7 @@
>  				#sound-dai-cells = <0>;
>  
>  				compatible = "st,stm32-sai-sub-a";
> -				reg = <0x4 0x1c>;
> +				reg = <0x4 0x20>;
>  				clocks = <&rcc SAI1_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 87 0x400 0x01>;
> @@ -852,7 +852,7 @@
>  			sai1b: audio-controller at 4400a024 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-b";
> -				reg = <0x24 0x1c>;
> +				reg = <0x24 0x20>;
>  				clocks = <&rcc SAI1_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 88 0x400 0x01>;
> @@ -873,7 +873,7 @@
>  			sai2a: audio-controller at 4400b004 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-a";
> -				reg = <0x4 0x1c>;
> +				reg = <0x4 0x20>;
>  				clocks = <&rcc SAI2_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 89 0x400 0x01>;
> @@ -883,7 +883,7 @@
>  			sai2b: audio-controller at 4400b024 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-b";
> -				reg = <0x24 0x1c>;
> +				reg = <0x24 0x20>;
>  				clocks = <&rcc SAI2_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 90 0x400 0x01>;
> @@ -904,7 +904,7 @@
>  			sai3a: audio-controller at 4400c004 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-a";
> -				reg = <0x04 0x1c>;
> +				reg = <0x04 0x20>;
>  				clocks = <&rcc SAI3_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 113 0x400 0x01>;
> @@ -914,7 +914,7 @@
>  			sai3b: audio-controller at 4400c024 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-b";
> -				reg = <0x24 0x1c>;
> +				reg = <0x24 0x20>;
>  				clocks = <&rcc SAI3_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 114 0x400 0x01>;
> @@ -1103,6 +1103,7 @@
>  			g-np-tx-fifo-size = <32>;
>  			g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
>  			dr_mode = "otg";
> +			otg-rev = <0x200>;
>  			usb33d-supply = <&usb33>;
>  			status = "disabled";
>  		};
> @@ -1301,7 +1302,7 @@
>  			sai4a: audio-controller at 50027004 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-a";
> -				reg = <0x04 0x1c>;
> +				reg = <0x04 0x20>;
>  				clocks = <&rcc SAI4_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 99 0x400 0x01>;
> @@ -1311,7 +1312,7 @@
>  			sai4b: audio-controller at 50027024 {
>  				#sound-dai-cells = <0>;
>  				compatible = "st,stm32-sai-sub-b";
> -				reg = <0x24 0x1c>;
> +				reg = <0x24 0x20>;
>  				clocks = <&rcc SAI4_K>;
>  				clock-names = "sai_ck";
>  				dmas = <&dmamux1 100 0x400 0x01>;
> @@ -1482,7 +1483,7 @@
>  		usbh_ohci: usb at 5800c000 {
>  			compatible = "generic-ohci";
>  			reg = <0x5800c000 0x1000>;
> -			clocks = <&rcc USBH>;
> +			clocks = <&rcc USBH>, <&usbphyc>;
>  			resets = <&rcc USBH_R>;
>  			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
>  			status = "disabled";
> diff --git a/arch/arm/dts/stm32mp15xx-dkx.dtsi b/arch/arm/dts/stm32mp15xx-dkx.dtsi
> index 8fc93b0f94..5502eec94b 100644
> --- a/arch/arm/dts/stm32mp15xx-dkx.dtsi
> +++ b/arch/arm/dts/stm32mp15xx-dkx.dtsi
> @@ -257,7 +257,7 @@
>  	stusb1600 at 28 {
>  		compatible = "st,stusb1600";
>  		reg = <0x28>;
> -		interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
> +		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
>  		interrupt-parent = <&gpioi>;
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&stusb1600_pins_a>;
Applied to u-boot-stm/master

Thanks
Patrice