SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / drivers / serial / altera_jtag_uart.c

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 0aa741c3537155c8dd47e25b639ca0640d03e143..61052a92d670aba70974ee3b3c1e2abd05542f2c 100644 (file)
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -1,25 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
  * Scott McNutt <smcnutt@psyent.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <asm/io.h>
-#include <linux/compiler.h>
 #include <serial.h>
-
-struct altera_jtaguart_regs {
-       u32     data;                   /* Data register */
-       u32     control;                /* Control register */
-};
-
-struct altera_jtaguart_platdata {
-       struct altera_jtaguart_regs *regs;
-};
+#include <asm/io.h>
 
 /* data register */
 #define ALTERA_JTAG_RVALID     BIT(15) /* Read valid */
@@ -27,11 +16,18 @@ struct altera_jtaguart_platdata {
 /* control register */
 #define ALTERA_JTAG_AC         BIT(10) /* activity indicator */
 #define ALTERA_JTAG_RRDY       BIT(12) /* read available */
-#define ALTERA_JTAG_WSPACE(d)  ((d)>>16)       /* Write space avail */
+#define ALTERA_JTAG_WSPACE(d)  ((d) >> 16)     /* Write space avail */
 /* Write fifo size. FIXME: this should be extracted with sopc2dts */
 #define ALTERA_JTAG_WRITE_DEPTH        64
 
-DECLARE_GLOBAL_DATA_PTR;
+struct altera_jtaguart_regs {
+       u32     data;                   /* Data register */
+       u32     control;                /* Control register */
+};
+
+struct altera_jtaguart_platdata {
+       struct altera_jtaguart_regs *regs;
+};
 
 static int altera_jtaguart_setbrg(struct udevice *dev, int baudrate)
 {
@@ -98,8 +94,9 @@ static int altera_jtaguart_ofdata_to_platdata(struct udevice *dev)
 {
        struct altera_jtaguart_platdata *plat = dev_get_platdata(dev);
 
-       plat->regs = ioremap(dev_get_addr(dev),
-               sizeof(struct altera_jtaguart_regs));
+       plat->regs = map_physmem(devfdt_get_addr(dev),
+                                sizeof(struct altera_jtaguart_regs),
+                                MAP_NOCACHE);
 
        return 0;
 }
@@ -112,8 +109,8 @@ static const struct dm_serial_ops altera_jtaguart_ops = {
 };
 
 static const struct udevice_id altera_jtaguart_ids[] = {
-       { .compatible = "altr,juart-1.0", },
-       { }
+       { .compatible = "altr,juart-1.0" },
+       {}
 };
 
 U_BOOT_DRIVER(altera_jtaguart) = {
@@ -131,7 +128,7 @@ U_BOOT_DRIVER(altera_jtaguart) = {
 
 #include <debug_uart.h>
 
-void debug_uart_init(void)
+static inline void _debug_uart_init(void)
 {
 }