Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-s5pc1xx / uart.h

diff --git a/arch/arm/include/asm/arch-s5pc1xx/uart.h b/arch/arm/include/asm/arch-s5pc1xx/uart.h
index 2d7ad7ec987ff1f7f900c7ba5a052eae72b50ce9..26db098842a8a02109e778f9ecb97aec2615ec71 100644 (file)
--- a/arch/arm/include/asm/arch-s5pc1xx/uart.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/uart.h
@@ -3,27 +3,19 @@
  * Minkyu Kang <mk7.kang@samsung.com>
  * Heungjun Kim <riverful.kim@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ASM_ARCH_UART_H_
 #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 +30,15 @@ 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 inline int s5p_uart_divslot(void)
+{
+       return 1;
+}
+
 #endif /* __ASSEMBLY__ */
 
 #endif