Hi,
On 01/12/2018 12:23 AM, patrice.chot...@st.com wrote:
> From: Patrice Chotard <patrice.chot...@st.com>
>
> Now this driver is used across stm32f4, stm32f7 and stm32h7
> SoCs family, give it a generic name.
>
> Signed-off-by: Patrice Chotard <patrice.chot...@st.com>
Reviewed-by: Vikas Manocha <vikas.mano...@st.com>
Cheers,
Vikas
> ---
> arch/arm/mach-stm32/Kconfig | 2 +-
> configs/stm32f429-discovery_defconfig | 2 +-
> configs/stm32f469-discovery_defconfig | 2 +-
> configs/stm32f746-disco_defconfig | 2 +-
> drivers/serial/Kconfig | 2 +-
> drivers/serial/Makefile | 2 +-
> drivers/serial/{serial_stm32x7.c => serial_stm32.c} | 4 ++--
> drivers/serial/{serial_stm32x7.h => serial_stm32.h} | 4 ++--
> 8 files changed, 10 insertions(+), 10 deletions(-)
> rename drivers/serial/{serial_stm32x7.c => serial_stm32.c} (98%)
> rename drivers/serial/{serial_stm32x7.h => serial_stm32.h} (97%)
>
> diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
> index b618b60..f4c93f1 100644
> --- 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 52bd931..6f7a12f 100644
> --- 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 afffddf..5b70aa9 100644
> --- 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 321321f..69df866 100644
> --- 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 122b8e7..7b20b47 100644
> --- 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 7adcee3..5ef603a 100644
> --- 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 d1580e3..286b954 100644
> --- 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 f7dca39..d08ba1f 100644
> --- 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)
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
