diff options
| author | Patrice Chotard <patrice.chotard@st.com> | 2017-07-18 07:29:07 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-26 15:26:54 (GMT) |
| commit | 122b2d4763e82e13f9b2735624813266047ddcd5 (patch) | |
| tree | e1f98eee7edaefe3300317cc514bc83a3990a45a | |
| parent | b9e86511d138dcca75171b846111373481f1ea6d (diff) | |
| download | u-boot-122b2d4763e82e13f9b2735624813266047ddcd5.tar.xz | |
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 <patrice.chotard@st.com>
Acked-by: Vikas MANOCHA <vikas.manocha@st.com>
| -rw-r--r-- | board/st/stm32f746-disco/stm32f746-disco.c | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_stm32x7.c | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_stm32x7.h | 5 | ||||
| -rw-r--r-- | include/dm/platform_data/serial_stm32x7.h | 17 |
4 files changed, 5 insertions, 19 deletions
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index fc4c60c..e3b662b 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -14,7 +14,6 @@ #include <asm/arch/stm32.h> #include <asm/arch/gpio.h> #include <asm/arch/fmc.h> -#include <dm/platform_data/serial_stm32x7.h> #include <asm/arch/stm32_periph.h> #include <asm/arch/stm32_defs.h> #include <asm/arch/syscfg.h> diff --git a/drivers/serial/serial_stm32x7.c b/drivers/serial/serial_stm32x7.c index 61e8167..05c73da 100644 --- a/drivers/serial/serial_stm32x7.c +++ b/drivers/serial/serial_stm32x7.c @@ -11,7 +11,6 @@ #include <asm/io.h> #include <serial.h> #include <asm/arch/stm32.h> -#include <dm/platform_data/serial_stm32x7.h> #include "serial_stm32x7.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/serial/serial_stm32x7.h b/drivers/serial/serial_stm32x7.h index facfdba..42b05f1 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 328a8a3..0000000 --- a/include/dm/platform_data/serial_stm32x7.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2016 - * Vikas Manocha, <vikas.manocha@st.com> - * - * 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 */ |