serial: stm32: Rename serial_stm32x7.c to serial_stm32.c

Now this driver is used across stm32f4, stm32f7 and stm32h7
SoCs family, give it a generic name.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Vikas Manocha <vikas.manocha@st.com>

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index b618b60795335ab3e43ad2d178e71616709c39f0..f4c93f1afbc1119b6ff8b7cbaf184cbf03191db4 100644 (file)
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -38,7 +38,7 @@ config STM32H7
        select STM32_SDRAM
        select STM32_RCC
        select STM32_RESET
-       select STM32X7_SERIAL
+       select STM32_SERIAL
        select SYSCON
 
 source "arch/arm/mach-stm32/stm32f4/Kconfig"

diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 52bd9319b3bfc96e83dc02dd97b3dfc5b8d81ca8..6f7a12f03777a33f9cf5960d0ca0ade50b820841 100644 (file)
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -31,4 +31,4 @@ CONFIG_RAM=y
 CONFIG_STM32_SDRAM=y
 CONFIG_DM_RESET=y
 CONFIG_STM32_RESET=y
-CONFIG_STM32X7_SERIAL=y
+CONFIG_STM32_SERIAL=y

diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig
index afffddfc1188df64db3f60e07fa76da7f9b80b86..5b70aa9f12257a804345104087012e9a474471b1 100644 (file)
--- a/configs/stm32f469-discovery_defconfig
+++ b/configs/stm32f469-discovery_defconfig
@@ -39,4 +39,4 @@ CONFIG_RAM=y
 CONFIG_STM32_SDRAM=y
 CONFIG_DM_RESET=y
 CONFIG_STM32_RESET=y
-CONFIG_STM32X7_SERIAL=y
+CONFIG_STM32_SERIAL=y

diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index 321321fbe8cc49e2a5341116c32490dffaf3344f..69df866457c805d4608576e8cd8de0620a424f43 100644 (file)
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -60,7 +60,7 @@ CONFIG_RAM=y
 CONFIG_STM32_SDRAM=y
 CONFIG_DM_RESET=y
 CONFIG_STM32_RESET=y
-CONFIG_STM32X7_SERIAL=y
+CONFIG_STM32_SERIAL=y
 CONFIG_DM_SPI=y
 CONFIG_STM32_QSPI=y
 CONFIG_OF_LIBFDT_OVERLAY=y

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 122b8e786a7af00590e3f7b0e3cea18b7423dfe3..7b20b47964639729cda9befae2cb11b2a7b81376 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -529,7 +529,7 @@ config STI_ASC_SERIAL
          on STiH410 SoC. This is a basic implementation,  it supports
          following baudrate 9600, 19200, 38400, 57600 and 115200.
 
-config STM32X7_SERIAL
+config STM32_SERIAL
        bool "STMicroelectronics STM32 SoCs on-chip UART"
        depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7)
        help

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 7adcee3e1045b027010308aa48a909b8ba56652d..5ef603ab1521c27f1261624762d9acc2ca47ff9a 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
 obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o
 obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o
 obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o
-obj-$(CONFIG_STM32X7_SERIAL) += serial_stm32x7.o
+obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o
 obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o
 obj-$(CONFIG_MSM_SERIAL) += serial_msm.o
 obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o

diff --git a/drivers/serial/serial_stm32x7.c b/drivers/serial/serial_stm32.c
similarity index 98%
rename from drivers/serial/serial_stm32x7.c
rename to drivers/serial/serial_stm32.c
index d1580e3cb521fa8b7aa4588915c9774fec2bff9a..286b954fdd74cfb98a93d573a1de1fca374aa90b 100644 (file)
--- a/drivers/serial/serial_stm32x7.c
+++ b/drivers/serial/serial_stm32.c
@@ -11,7 +11,7 @@
 #include <asm/io.h>
 #include <serial.h>
 #include <asm/arch/stm32.h>
-#include "serial_stm32x7.h"
+#include "serial_stm32.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -148,7 +148,7 @@ static const struct dm_serial_ops stm32_serial_ops = {
 };
 
 U_BOOT_DRIVER(serial_stm32) = {
-       .name = "serial_stm32x7",
+       .name = "serial_stm32",
        .id = UCLASS_SERIAL,
        .of_match = of_match_ptr(stm32_serial_id),
        .ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata),

diff --git a/drivers/serial/serial_stm32x7.h b/drivers/serial/serial_stm32.h
similarity index 97%
rename from drivers/serial/serial_stm32x7.h
rename to drivers/serial/serial_stm32.h
index f7dca39103dd435b17e87d6a08e0e5c060020a15..d08ba1f55fc4021074febc052621063e3363cd3d 100644 (file)
--- a/drivers/serial/serial_stm32x7.h
+++ b/drivers/serial/serial_stm32.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef _SERIAL_STM32_X7_
-#define _SERIAL_STM32_X7_
+#ifndef _SERIAL_STM32_
+#define _SERIAL_STM32_
 
 #define CR1_OFFSET(x)  (x ? 0x0c : 0x00)
 #define CR3_OFFSET(x)  (x ? 0x14 : 0x08)