[07/10] ARM: dts: stm32: add ltdc support on stm32f746 MCU

Message ID 20230903204849.660722-8-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • ARM: dts: stm32f746 sync with Linux kernel 6.5
Related show

Commit Message

Dario Binacchi Sept. 3, 2023, 8:48 p.m. UTC
The patch applies the changes from Linux commit 008ef8b3a1a00 ("Add LTDC
(Lcd-tft Display Controller) support") and removes the same settings
from stm32f746-disco-u-boot.dtsi.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 arch/arm/dts/stm32f746-disco-u-boot.dtsi | 18 ++++++------------
 arch/arm/dts/stm32f746.dtsi              | 10 ++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

Comments

Patrice CHOTARD Sept. 26, 2023, 8:54 a.m. UTC | #1
On 9/3/23 22:48, Dario Binacchi wrote:
> The patch applies the changes from Linux commit 008ef8b3a1a00 ("Add LTDC
> (Lcd-tft Display Controller) support") and removes the same settings
> from stm32f746-disco-u-boot.dtsi.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> 
>  arch/arm/dts/stm32f746-disco-u-boot.dtsi | 18 ++++++------------
>  arch/arm/dts/stm32f746.dtsi              | 10 ++++++++++
>  2 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> index 522cffb1ac9f..3c2b9fc59512 100644
> --- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> +++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> @@ -63,19 +63,13 @@
>  			};
>  		};
>  	};
> +};
>  
> -	soc {
> -		ltdc: display-controller@40016800 {
> -			compatible = "st,stm32-ltdc";
> -			reg = <0x40016800 0x200>;
> -			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
> -			clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
> -			pinctrl-0 = <&ltdc_pins>;
> -
> -			status = "okay";
> -			bootph-all;
> -		};
> -	};
> +&ltdc {
> +	clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
> +	pinctrl-0 = <&ltdc_pins>;
> +	status = "okay";
> +	bootph-all;
>  };
>  
>  &fmc {
> diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi
> index 7b4bd805c998..79dad3192e15 100644
> --- a/arch/arm/dts/stm32f746.dtsi
> +++ b/arch/arm/dts/stm32f746.dtsi
> @@ -518,6 +518,16 @@
>  			};
>  		};
>  
> +		ltdc: display-controller@40016800 {
> +			compatible = "st,stm32-ltdc";
> +			reg = <0x40016800 0x200>;
> +			interrupts = <88>, <89>;
> +			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
> +			clocks = <&rcc 1 CLK_LCD>;
> +			clock-names = "lcd";
> +			status = "disabled";
> +		};
> +
>  		pwrcfg: power-config@40007000 {
>  			compatible = "st,stm32-power-config", "syscon";
>  			reg = <0x40007000 0x400>;
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

Thanks
Patrice
Patrice CHOTARD Sept. 26, 2023, 9:22 a.m. UTC | #2
On 9/3/23 22:48, Dario Binacchi wrote:
> The patch applies the changes from Linux commit 008ef8b3a1a00 ("Add LTDC
> (Lcd-tft Display Controller) support") and removes the same settings
> from stm32f746-disco-u-boot.dtsi.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> 
>  arch/arm/dts/stm32f746-disco-u-boot.dtsi | 18 ++++++------------
>  arch/arm/dts/stm32f746.dtsi              | 10 ++++++++++
>  2 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> index 522cffb1ac9f..3c2b9fc59512 100644
> --- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> +++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
> @@ -63,19 +63,13 @@
>  			};
>  		};
>  	};
> +};
>  
> -	soc {
> -		ltdc: display-controller@40016800 {
> -			compatible = "st,stm32-ltdc";
> -			reg = <0x40016800 0x200>;
> -			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
> -			clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
> -			pinctrl-0 = <&ltdc_pins>;
> -
> -			status = "okay";
> -			bootph-all;
> -		};
> -	};
> +&ltdc {
> +	clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
> +	pinctrl-0 = <&ltdc_pins>;
> +	status = "okay";
> +	bootph-all;
>  };
>  
>  &fmc {
> diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi
> index 7b4bd805c998..79dad3192e15 100644
> --- a/arch/arm/dts/stm32f746.dtsi
> +++ b/arch/arm/dts/stm32f746.dtsi
> @@ -518,6 +518,16 @@
>  			};
>  		};
>  
> +		ltdc: display-controller@40016800 {
> +			compatible = "st,stm32-ltdc";
> +			reg = <0x40016800 0x200>;
> +			interrupts = <88>, <89>;
> +			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
> +			clocks = <&rcc 1 CLK_LCD>;
> +			clock-names = "lcd";
> +			status = "disabled";
> +		};
> +
>  		pwrcfg: power-config@40007000 {
>  			compatible = "st,stm32-power-config", "syscon";
>  			reg = <0x40007000 0x400>;
Apply on stm32/next

Thanks
Patrice

Patch

diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
index 522cffb1ac9f..3c2b9fc59512 100644
--- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi
+++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi
@@ -63,19 +63,13 @@ 
 			};
 		};
 	};
+};
 
-	soc {
-		ltdc: display-controller@40016800 {
-			compatible = "st,stm32-ltdc";
-			reg = <0x40016800 0x200>;
-			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
-			clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
-			pinctrl-0 = <&ltdc_pins>;
-
-			status = "okay";
-			bootph-all;
-		};
-	};
+&ltdc {
+	clocks = <&rcc 0 STM32F7_APB2_CLOCK(LTDC)>;
+	pinctrl-0 = <&ltdc_pins>;
+	status = "okay";
+	bootph-all;
 };
 
 &fmc {
diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi
index 7b4bd805c998..79dad3192e15 100644
--- a/arch/arm/dts/stm32f746.dtsi
+++ b/arch/arm/dts/stm32f746.dtsi
@@ -518,6 +518,16 @@ 
 			};
 		};
 
+		ltdc: display-controller@40016800 {
+			compatible = "st,stm32-ltdc";
+			reg = <0x40016800 0x200>;
+			interrupts = <88>, <89>;
+			resets = <&rcc STM32F7_APB2_RESET(LTDC)>;
+			clocks = <&rcc 1 CLK_LCD>;
+			clock-names = "lcd";
+			status = "disabled";
+		};
+
 		pwrcfg: power-config@40007000 {
 			compatible = "st,stm32-power-config", "syscon";
 			reg = <0x40007000 0x400>;