From: Patrice Chotard Date: Tue, 18 Jul 2017 07:29:07 +0000 (+0200) Subject: serial: stm32x7: migrate serial struct to driver X-Git-Tag: v2017.09-rc1~106 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=122b2d4763e82e13f9b2735624813266047ddcd5;p=u-boot serial: stm32x7: migrate serial struct to driver This allow to remove include/dm/platform_data/serial_stm32x7.h which was included in the past by stm32x7 driver and by stm32f746-disco.c board file. Since patch 42bf5e7c27 "serial: stm32f7: add device tree support" this file is no more needed in board file. Signed-off-by: Patrice Chotard Acked-by: Vikas MANOCHA --- diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index fc4c60c3a4..e3b662ba72 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/serial/serial_stm32x7.c b/drivers/serial/serial_stm32x7.c index 61e8167a3b..05c73da230 100644 --- a/drivers/serial/serial_stm32x7.c +++ b/drivers/serial/serial_stm32x7.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "serial_stm32x7.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/serial/serial_stm32x7.h b/drivers/serial/serial_stm32x7.h index facfdbabe8..42b05f14b5 100644 --- a/drivers/serial/serial_stm32x7.h +++ b/drivers/serial/serial_stm32x7.h @@ -22,6 +22,11 @@ struct stm32_usart { u32 tx_dr; }; +/* Information about a serial port */ +struct stm32x7_serial_platdata { + struct stm32_usart *base; /* address of registers in physical memory */ + unsigned int clock; +}; #define USART_CR1_OVER8 (1 << 15) #define USART_CR1_TE (1 << 3) diff --git a/include/dm/platform_data/serial_stm32x7.h b/include/dm/platform_data/serial_stm32x7.h deleted file mode 100644 index 328a8a3ff2..0000000000 --- a/include/dm/platform_data/serial_stm32x7.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2016 - * Vikas Manocha, - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __SERIAL_STM32x7_H -#define __SERIAL_STM32x7_H - -/* Information about a serial port */ -struct stm32x7_serial_platdata { - struct stm32_usart *base; /* address of registers in physical memory */ - unsigned int clock; -}; - -#endif /* __SERIAL_STM32x7_H */