From 17e06fb457c8daf84df8677c4698a734e2c2dcf4 Mon Sep 17 00:00:00 2001
From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Thu, 15 Oct 2015 09:48:03 +0300
Subject: [PATCH] uart: Move generic API to root directory of include

Only driver specific public headers should be found in include/drivers.
All generic API are found in include/ directory.

Change-Id: Ic50931987bb9460fd4a3843abc6f5de107faf045
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 arch/arc/platforms/generic_arc/system.c            | 2 +-
 arch/arm/platforms/fsl_frdm_k64f/platform_config.c | 2 +-
 arch/arm/platforms/fsl_frdm_k64f/system.c          | 2 +-
 arch/arm/platforms/ti_lm3s6965/platform_config.c   | 2 +-
 arch/x86/platforms/galileo/galileo.c               | 2 +-
 arch/x86/platforms/galileo/galileo_config.c        | 2 +-
 arch/x86/platforms/ia32/ia32.c                     | 2 +-
 arch/x86/platforms/ia32/ia32_config.c              | 2 +-
 arch/x86/platforms/ia32_pci/ia32_pci.c             | 2 +-
 arch/x86/platforms/ia32_pci/ia32_pci_config.c      | 2 +-
 drivers/bluetooth/uart.c                           | 2 +-
 drivers/console/uart_console.c                     | 2 +-
 drivers/serial/k20UartDrv.c                        | 2 +-
 drivers/serial/k20UartDrv.h                        | 2 +-
 drivers/serial/ns16550.c                           | 2 +-
 drivers/serial/ns16550.h                           | 2 +-
 drivers/serial/nsim_uart.c                         | 2 +-
 drivers/serial/nsim_uart.h                         | 2 +-
 drivers/serial/serial.c                            | 2 +-
 drivers/serial/stellarisUartDrv.c                  | 2 +-
 drivers/serial/stellarisUartDrv.h                  | 2 +-
 drivers/simple/uart.c                              | 2 +-
 include/{drivers => }/uart.h                       | 0
 samples/microkernel/apps/nfc_hello/src/main.c      | 2 +-
 24 files changed, 23 insertions(+), 23 deletions(-)
 rename include/{drivers => }/uart.h (100%)

diff --git a/arch/arc/platforms/generic_arc/system.c b/arch/arc/platforms/generic_arc/system.c
index 826cb3ca3b8..9b4f0527ba3 100644
--- a/arch/arc/platforms/generic_arc/system.c
+++ b/arch/arc/platforms/generic_arc/system.c
@@ -25,7 +25,7 @@ for the generic arc platform.
 #include <nanokernel.h>
 #include <board.h>
 #include <init.h>
-#include <drivers/uart.h>
+#include <uart.h>
 
 /* Cannot use microkernel, since only nanokernel is supported */
 #if defined(CONFIG_MICROKERNEL)
diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c
index 44ebc5cb8a9..44b93804a29 100644
--- a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c
+++ b/arch/arm/platforms/fsl_frdm_k64f/platform_config.c
@@ -26,7 +26,7 @@
 #include "board.h"
 
 #ifdef CONFIG_K20_UART
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/k20_pcr.h>
 #include <drivers/k20_uart.h>
 #include <console/uart_console.h>
diff --git a/arch/arm/platforms/fsl_frdm_k64f/system.c b/arch/arm/platforms/fsl_frdm_k64f/system.c
index e2b5faf7caf..8565340441f 100644
--- a/arch/arm/platforms/fsl_frdm_k64f/system.c
+++ b/arch/arm/platforms/fsl_frdm_k64f/system.c
@@ -27,7 +27,7 @@ for the fsl_frdm_k64f platform.
 #include <init.h>
 #include <board.h>
 #include <drivers/k20_mcg.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/k20_pcr.h>
 #include <drivers/k20_sim.h>
 #include <drivers/k6x_mpu.h>
diff --git a/arch/arm/platforms/ti_lm3s6965/platform_config.c b/arch/arm/platforms/ti_lm3s6965/platform_config.c
index 840859b1095..6382f69fe07 100644
--- a/arch/arm/platforms/ti_lm3s6965/platform_config.c
+++ b/arch/arm/platforms/ti_lm3s6965/platform_config.c
@@ -26,7 +26,7 @@
 #include "board.h"
 
 #ifdef CONFIG_STELLARIS_UART
-#include <drivers/uart.h>
+#include <uart.h>
 #include <console/uart_console.h>
 #include <serial/stellarisUartDrv.h>
 
diff --git a/arch/x86/platforms/galileo/galileo.c b/arch/x86/platforms/galileo/galileo.c
index a553b42310b..82a6e4604f5 100644
--- a/arch/x86/platforms/galileo/galileo.c
+++ b/arch/x86/platforms/galileo/galileo.c
@@ -31,7 +31,7 @@ Handlers for the secondary serial port have not been added.
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include "board.h"
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/ioapic.h>
 #include <drivers/pic.h>
 #include <drivers/pci/pci.h>
diff --git a/arch/x86/platforms/galileo/galileo_config.c b/arch/x86/platforms/galileo/galileo_config.c
index c72c1d398db..4390e1a7bd5 100644
--- a/arch/x86/platforms/galileo/galileo_config.c
+++ b/arch/x86/platforms/galileo/galileo_config.c
@@ -26,7 +26,7 @@
 #include "board.h"
 
 #ifdef CONFIG_NS16550
-#include <drivers/uart.h>
+#include <uart.h>
 #include <bluetooth/uart.h>
 #include <console/uart_console.h>
 #include <serial/ns16550.h>
diff --git a/arch/x86/platforms/ia32/ia32.c b/arch/x86/platforms/ia32/ia32.c
index c50028dcfbf..21298e04659 100644
--- a/arch/x86/platforms/ia32/ia32.c
+++ b/arch/x86/platforms/ia32/ia32.c
@@ -24,7 +24,7 @@ for the ia32 platform.
 
 #include <nanokernel.h>
 #include "board.h"
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/pic.h>
 #include <device.h>
 #include <init.h>
diff --git a/arch/x86/platforms/ia32/ia32_config.c b/arch/x86/platforms/ia32/ia32_config.c
index 225507b048a..1cb6a0642f2 100644
--- a/arch/x86/platforms/ia32/ia32_config.c
+++ b/arch/x86/platforms/ia32/ia32_config.c
@@ -26,7 +26,7 @@
 #include "board.h"
 
 #ifdef CONFIG_NS16550
-#include <drivers/uart.h>
+#include <uart.h>
 #include <bluetooth/uart.h>
 #include <console/uart_console.h>
 #include <serial/ns16550.h>
diff --git a/arch/x86/platforms/ia32_pci/ia32_pci.c b/arch/x86/platforms/ia32_pci/ia32_pci.c
index e0c11b29331..f1604f99886 100644
--- a/arch/x86/platforms/ia32_pci/ia32_pci.c
+++ b/arch/x86/platforms/ia32_pci/ia32_pci.c
@@ -31,7 +31,7 @@ Handlers for the secondary serial port have not been added.
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include "board.h"
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/ioapic.h>
 #include <drivers/pic.h>
 #include <drivers/pci/pci.h>
diff --git a/arch/x86/platforms/ia32_pci/ia32_pci_config.c b/arch/x86/platforms/ia32_pci/ia32_pci_config.c
index 0afc33904ff..5eb1488ffbf 100644
--- a/arch/x86/platforms/ia32_pci/ia32_pci_config.c
+++ b/arch/x86/platforms/ia32_pci/ia32_pci_config.c
@@ -26,7 +26,7 @@
 #include "board.h"
 
 #ifdef CONFIG_NS16550
-#include <drivers/uart.h>
+#include <uart.h>
 #include <bluetooth/uart.h>
 #include <console/uart_console.h>
 #include <serial/ns16550.h>
diff --git a/drivers/bluetooth/uart.c b/drivers/bluetooth/uart.c
index 847e3ba8df5..cd4a83d0164 100644
--- a/drivers/bluetooth/uart.c
+++ b/drivers/bluetooth/uart.c
@@ -23,7 +23,7 @@
 #include <arch/cpu.h>
 
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <misc/byteorder.h>
 #include <string.h>
 
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index 9ee791dd81c..d19957afa0a 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -34,7 +34,7 @@
 #include <init.h>
 
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <console/uart_console.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/drivers/serial/k20UartDrv.c b/drivers/serial/k20UartDrv.c
index 1626858c46f..8ed7d09d1ce 100644
--- a/drivers/serial/k20UartDrv.c
+++ b/drivers/serial/k20UartDrv.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <drivers/k20_uart.h>
 #include <drivers/k20_sim.h>
 #include <toolchain.h>
diff --git a/drivers/serial/k20UartDrv.h b/drivers/serial/k20UartDrv.h
index 21af114d9ef..83717e97e11 100644
--- a/drivers/serial/k20UartDrv.h
+++ b/drivers/serial/k20UartDrv.h
@@ -21,7 +21,7 @@
 #ifndef _DRIVERS_UART_K20_H_
 #define _DRIVERS_UART_K20_H_
 
-#include <drivers/uart.h>
+#include <uart.h>
 
 void k20_uart_port_init(struct device *, const struct uart_init_info * const);
 
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index b65c0459ec8..474e3e91386 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -37,7 +37,7 @@
 #include <board.h>
 #include <toolchain.h>
 #include <sections.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <sys_io.h>
 #ifdef CONFIG_PCI
 #include <pci/pci.h>
diff --git a/drivers/serial/ns16550.h b/drivers/serial/ns16550.h
index a0faf42c223..cafe0a70b95 100644
--- a/drivers/serial/ns16550.h
+++ b/drivers/serial/ns16550.h
@@ -21,7 +21,7 @@
 #ifndef _DRIVERS_UART_NS16550_H_
 #define _DRIVERS_UART_NS16550_H_
 
-#include <drivers/uart.h>
+#include <uart.h>
 
 /** Device data structure */
 struct uart_ns16550_dev_data_t {
diff --git a/drivers/serial/nsim_uart.c b/drivers/serial/nsim_uart.c
index 3595338dc20..2b16501fa45 100644
--- a/drivers/serial/nsim_uart.c
+++ b/drivers/serial/nsim_uart.c
@@ -22,7 +22,7 @@
 #include <misc/util.h>
 #include <string.h>
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 
 #define NSIM_UART_DATA 0
 #define NSIM_UART_STATUS 1
diff --git a/drivers/serial/nsim_uart.h b/drivers/serial/nsim_uart.h
index bd0dbcc6dce..ff67d489aef 100644
--- a/drivers/serial/nsim_uart.h
+++ b/drivers/serial/nsim_uart.h
@@ -21,7 +21,7 @@
 #ifndef _DRIVERS_UART_NSIM_H_
 #define _DRIVERS_UART_NSIM_H_
 
-#include <drivers/uart.h>
+#include <uart.h>
 
 void nsim_uart_port_init(struct device *, const struct uart_init_info * const);
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index c14cc8c7eee..e5739a19991 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -17,7 +17,7 @@
 #include <nanokernel.h>
 #include <device.h>
 
-#include <drivers/uart.h>
+#include <uart.h>
 
 /**
  * @brief UART initialization routine for platform drivers.
diff --git a/drivers/serial/stellarisUartDrv.c b/drivers/serial/stellarisUartDrv.c
index 9d39392641f..0e1adff1174 100644
--- a/drivers/serial/stellarisUartDrv.c
+++ b/drivers/serial/stellarisUartDrv.c
@@ -30,7 +30,7 @@
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 #include <sections.h>
 
 /* definitions */
diff --git a/drivers/serial/stellarisUartDrv.h b/drivers/serial/stellarisUartDrv.h
index 2f02a5b3772..f591dc198ad 100644
--- a/drivers/serial/stellarisUartDrv.h
+++ b/drivers/serial/stellarisUartDrv.h
@@ -21,7 +21,7 @@
 #ifndef _DRIVERS_UART_STELLARIS_H_
 #define _DRIVERS_UART_STELLARIS_H_
 
-#include <drivers/uart.h>
+#include <uart.h>
 
 void stellaris_uart_port_init(struct device *,
 			      const struct uart_init_info * const);
diff --git a/drivers/simple/uart.c b/drivers/simple/uart.c
index 61f0fef8356..3f009c0a7fc 100644
--- a/drivers/simple/uart.c
+++ b/drivers/simple/uart.c
@@ -25,7 +25,7 @@
 #include <arch/cpu.h>
 
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 
 #include <simple/uart.h>
 #include <misc/printk.h>
diff --git a/include/drivers/uart.h b/include/uart.h
similarity index 100%
rename from include/drivers/uart.h
rename to include/uart.h
diff --git a/samples/microkernel/apps/nfc_hello/src/main.c b/samples/microkernel/apps/nfc_hello/src/main.c
index be4330bd030..bec8a6ddab7 100644
--- a/samples/microkernel/apps/nfc_hello/src/main.c
+++ b/samples/microkernel/apps/nfc_hello/src/main.c
@@ -21,7 +21,7 @@
 #include <nanokernel.h>
 #include <arch/cpu.h>
 #include <board.h>
-#include <drivers/uart.h>
+#include <uart.h>
 
 #define UART1 (uart_devs[1])
 #define UART1_IRQ COM2_INT_LVL