On Sat, May 02, 2015 at 07:26:13PM -0700, Andrey Smirnov wrote:
> Move UART definitions into a separate file to avoid redefinition in
> <mach/debug_ll.h> and magical constants in low level UART
> initialization code.
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> ---
> arch/arm/mach-imx/include/mach/debug_ll.h | 9 +--
> arch/arm/mach-imx/include/mach/serial.h | 112 ++++++++++++++++++++++++++++++
> drivers/serial/serial_imx.c | 108 +---------------------------
> 3 files changed, 114 insertions(+), 115 deletions(-)
> create mode 100644 arch/arm/mach-imx/include/mach/serial.h
>
> diff --git a/arch/arm/mach-imx/include/mach/debug_ll.h b/arch/arm/mach-imx/include/mach/debug_ll.h
> index f34eaa1..1c9f3a6 100644
> --- a/arch/arm/mach-imx/include/mach/debug_ll.h
> +++ b/arch/arm/mach-imx/include/mach/debug_ll.h
> @@ -12,6 +12,7 @@
> #include <mach/imx51-regs.h>
> #include <mach/imx53-regs.h>
> #include <mach/imx6-regs.h>
> +#include <mach/serial.h>
>
> #ifdef CONFIG_DEBUG_LL
>
> @@ -40,14 +41,6 @@
> #define __IMX_UART_BASE(soc, num) soc##_UART##num##_BASE_ADDR
> #define IMX_UART_BASE(soc, num) __IMX_UART_BASE(soc, num)
>
> -#define URTX0 0x40 /* Transmitter Register */
> -
> -#define UCR1 0x80 /* Control Register 1 */
> -#define UCR1_UARTEN (1 << 0) /* UART enabled */
> -
> -#define USR2 0x98 /* Status Register 2 */
> -#define USR2_TXDC (1 << 3) /* Transmitter complete */
> -
> static inline void PUTC_LL(int c)
> {
> void __iomem *base = (void *)IMX_UART_BASE(IMX_DEBUG_SOC,
> diff --git a/arch/arm/mach-imx/include/mach/serial.h b/arch/arm/mach-imx/include/mach/serial.h
> new file mode 100644
> index 0000000..b999c58
> --- /dev/null
> +++ b/arch/arm/mach-imx/include/mach/serial.h
Normally we no longer put register definitions into mach/ since this
limits the driver to a single architecture. In case of the imx UART
driver this (currently) doesn't matter but I think we should use
a place include/ anyway. I think include/serial/imx-uart.h would be
appropriate.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
