diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-19 18:49:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-19 19:13:38 (GMT) |
| commit | 02ccab1908c405fe1449457d4a0d343784a30acb (patch) | |
| tree | 3a5d41abff96a3af22587ace67713d5c0165b097 /arch/arm/include/asm/arch-fsl-layerscape | |
| parent | f40574e2d78c96a3818c4fa2379382d924866a6e (diff) | |
| parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff) | |
| download | u-boot-fsl-qoriq-02ccab1908c405fe1449457d4a0d343784a30acb.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
Diffstat (limited to 'arch/arm/include/asm/arch-fsl-layerscape')
| -rw-r--r-- | arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h b/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h index 57e417b..b0e58ca 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h @@ -10,46 +10,4 @@ #define I2C_QUIRK_REG /* enable 8-bit driver */ -#ifdef CONFIG_FSL_LPUART -#ifdef CONFIG_LPUART_32B_REG -struct lpuart_fsl { - u32 baud; - u32 stat; - u32 ctrl; - u32 data; - u32 match; - u32 modir; - u32 fifo; - u32 water; -}; -#else -struct lpuart_fsl { - u8 ubdh; - u8 ubdl; - u8 uc1; - u8 uc2; - u8 us1; - u8 us2; - u8 uc3; - u8 ud; - u8 uma1; - u8 uma2; - u8 uc4; - u8 uc5; - u8 ued; - u8 umodem; - u8 uir; - u8 reserved; - u8 upfifo; - u8 ucfifo; - u8 usfifo; - u8 utwfifo; - u8 utcfifo; - u8 urwfifo; - u8 urcfifo; - u8 rsvd[28]; -}; -#endif -#endif /* CONFIG_FSL_LPUART */ - #endif /* __ASM_ARCH_FSL_LAYERSCAPE_IMX_REGS_H__ */ |