Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Patrice Chotard 2018-01-12 09:23:49 +01:00 committed by Tom Rini
parent e6e5ecc5e2
commit ae74de0dfd
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-stm32/Kconfig
View file

@ -38,7 +38,7 @@ config STM32H7
select STM32_SDRAM select STM32_SDRAM
select STM32_RCC select STM32_RCC
select STM32_RESET select STM32_RESET
select STM32X7_SERIAL select STM32_SERIAL
select SYSCON select SYSCON
source "arch/arm/mach-stm32/stm32f4/Kconfig" source "arch/arm/mach-stm32/stm32f4/Kconfig"

2
configs/stm32f429-discovery_defconfig
View file

@ -31,4 +31,4 @@ CONFIG_RAM=y
CONFIG_STM32_SDRAM=y CONFIG_STM32_SDRAM=y
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_STM32_RESET=y CONFIG_STM32_RESET=y
CONFIG_STM32X7_SERIAL=y CONFIG_STM32_SERIAL=y

2
configs/stm32f469-discovery_defconfig
View file

@ -39,4 +39,4 @@ CONFIG_RAM=y
CONFIG_STM32_SDRAM=y CONFIG_STM32_SDRAM=y
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_STM32_RESET=y CONFIG_STM32_RESET=y
CONFIG_STM32X7_SERIAL=y CONFIG_STM32_SERIAL=y

2
configs/stm32f746-disco_defconfig
View file

@ -60,7 +60,7 @@ CONFIG_RAM=y
CONFIG_STM32_SDRAM=y CONFIG_STM32_SDRAM=y
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_STM32_RESET=y CONFIG_STM32_RESET=y
CONFIG_STM32X7_SERIAL=y CONFIG_STM32_SERIAL=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_STM32_QSPI=y CONFIG_STM32_QSPI=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y

2
drivers/serial/Kconfig
View file

@ -529,7 +529,7 @@ config STI_ASC_SERIAL
on STiH410 SoC. This is a basic implementation, it supports on STiH410 SoC. This is a basic implementation, it supports
following baudrate 9600, 19200, 38400, 57600 and 115200. following baudrate 9600, 19200, 38400, 57600 and 115200.
config STM32X7_SERIAL config STM32_SERIAL
bool "STMicroelectronics STM32 SoCs on-chip UART" bool "STMicroelectronics STM32 SoCs on-chip UART"
depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7) depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7)
help help

2
drivers/serial/Makefile
View file

@ -44,7 +44,7 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o
obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o
obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.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_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o
obj-$(CONFIG_MSM_SERIAL) += serial_msm.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o
obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o

4
drivers/serial/serial_stm32x7.c → drivers/serial/serial_stm32.c
View file

@ -11,7 +11,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <serial.h> #include <serial.h>
#include <asm/arch/stm32.h> #include <asm/arch/stm32.h>
#include "serial_stm32x7.h" #include "serial_stm32.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -148,7 +148,7 @@ static const struct dm_serial_ops stm32_serial_ops = {
}; };
U_BOOT_DRIVER(serial_stm32) = { U_BOOT_DRIVER(serial_stm32) = {
.name = "serial_stm32x7", .name = "serial_stm32",
.id = UCLASS_SERIAL, .id = UCLASS_SERIAL,
.of_match = of_match_ptr(stm32_serial_id), .of_match = of_match_ptr(stm32_serial_id),
.ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata), .ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata),

4
drivers/serial/serial_stm32x7.h → drivers/serial/serial_stm32.h
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef _SERIAL_STM32_X7_ #ifndef _SERIAL_STM32_
#define _SERIAL_STM32_X7_ #define _SERIAL_STM32_
#define CR1_OFFSET(x) (x ? 0x0c : 0x00) #define CR1_OFFSET(x) (x ? 0x0c : 0x00)
#define CR3_OFFSET(x) (x ? 0x14 : 0x08) #define CR3_OFFSET(x) (x ? 0x14 : 0x08)