diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:47:48 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:47:48 +0200 |
commit | 17dd883c5b76bdade0f7a48f2eb02d918a5ebef9 (patch) | |
tree | 790d4c37f7f60db732ba4595cf6b66d46dd8de65 /arch/arm/include/asm/arch-s5pc1xx/uart.h | |
parent | 3388db2cd72d85717596158131b3e48efe2acfea (diff) | |
parent | d9abba8254c3e6b9a1d5c2e52c2d8088bbeb520f (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm/include/asm/arch-s5pc1xx/uart.h')
-rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/uart.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h index 2d7ad7ec987..f6eeab45cdc 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/uart.h +++ b/arch/arm/include/asm/arch-s5pc1xx/uart.h @@ -24,6 +24,12 @@ #define __ASM_ARCH_UART_H_ #ifndef __ASSEMBLY__ +/* baudrate rest value */ +union br_rest { + unsigned short slot; /* udivslot */ + unsigned char value; /* ufracval */ +}; + struct s5p_uart { unsigned int ulcon; unsigned int ucon; @@ -38,10 +44,12 @@ struct s5p_uart { unsigned char urxh; unsigned char res2[3]; unsigned int ubrdiv; - unsigned short udivslot; - unsigned char res3[2]; - unsigned char res4[0x3d0]; + union br_rest rest; + unsigned char res3[0x3d0]; }; + +static int use_divslot = 1; + #endif /* __ASSEMBLY__ */ #endif |