diff mbox

[U-Boot,1/2] serial: stm32x7: align compatible with kernel one

Message ID 1496906815-5522-2-git-send-email-patrice.chotard@st.com
State Accepted
Commit 1113ad49dce7d56429c6ad37738d06e7aef21fac
Delegated to: Tom Rini
Headers show

Commit Message

Patrice CHOTARD June 8, 2017, 7:26 a.m. UTC 
From: Patrice Chotard <patrice.chotard@st.com>

stm32x7.c driver is dedicated for STM32F7.
In kernel, "st,stm32-usart" and "st,stm32-uart" compatible
strings are dedicated for STM32F4.

To keep U-boot and kernel aligned, replace the serial compatible
string from "st,stm32-usart", "st,stm32-uart" to
"st,stm32f7-usart", "st,stm32f7-uart" specific for STM32F7.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Christophe KERELLO <christophe.kerello@st.com>
Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>
Acked-by: Vikas MANOCHA <vikas.manocha@st.com>
---
 arch/arm/dts/stm32f746.dtsi     | 2 +-
 drivers/serial/serial_stm32x7.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini June 12, 2017, 10:43 p.m. UTC | #1 
On Thu, Jun 08, 2017 at 09:26:54AM +0200, Patrice Chotard wrote:

> From: Patrice Chotard <patrice.chotard@st.com>
> 
> stm32x7.c driver is dedicated for STM32F7.
> In kernel, "st,stm32-usart" and "st,stm32-uart" compatible
> strings are dedicated for STM32F4.
> 
> To keep U-boot and kernel aligned, replace the serial compatible
> string from "st,stm32-usart", "st,stm32-uart" to
> "st,stm32f7-usart", "st,stm32f7-uart" specific for STM32F7.
> 
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> Reviewed-by: Christophe KERELLO <christophe.kerello@st.com>
> Reviewed-by: Patrick DELAUNAY <patrick.delaunay@st.com>
> Acked-by: Vikas MANOCHA <vikas.manocha@st.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
diff mbox

Patch

diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi
index ac24d98..54f5bc7 100644
--- a/arch/arm/dts/stm32f746.dtsi
+++ b/arch/arm/dts/stm32f746.dtsi
@@ -90,7 +90,7 @@ 
 			status = "disabled";
 		};
 		usart1: serial@40011000 {
-			compatible = "st,stm32-usart", "st,stm32-uart";
+			compatible = "st,stm32f7-usart", "st,stm32f7-uart";
 			reg = <0x40011000 0x400>;
 			interrupts = <37>;
 			clocks = <&rcc 0 164>;
diff --git a/drivers/serial/serial_stm32x7.c b/drivers/serial/serial_stm32x7.c
index bdabf87..27e0068 100644
--- a/drivers/serial/serial_stm32x7.c
+++ b/drivers/serial/serial_stm32x7.c
@@ -100,8 +100,8 @@  static int stm32_serial_probe(struct udevice *dev)
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 static const struct udevice_id stm32_serial_id[] = {
-	{.compatible = "st,stm32-usart"},
-	{.compatible = "st,stm32-uart"},
+	{.compatible = "st,stm32f7-usart"},
+	{.compatible = "st,stm32f7-uart"},
 	{}
 };