From: Patrice Chotard Date: Thu, 8 Jun 2017 07:26:54 +0000 (+0200) Subject: serial: stm32x7: align compatible with kernel one X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1113ad49dce7d56429c6ad37738d06e7aef21fac;p=project%2Fbcm63xx%2Fu-boot.git serial: stm32x7: align compatible with kernel one 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 Reviewed-by: Christophe KERELLO Reviewed-by: Patrick DELAUNAY Acked-by: Vikas MANOCHA --- diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi index ac24d986e0..54f5bc7a54 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 483e4ba67d..7693159af2 100644 --- a/drivers/serial/serial_stm32x7.c +++ b/drivers/serial/serial_stm32x7.c @@ -103,8 +103,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"}, {} };