From 86256b796ee757b7d1407233d0ca71576a7b8182 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Fri, 24 Oct 2014 12:41:19 +0900
Subject: dm: move platform data headers to include/dm/platform_data

The platform_data definitions are generally referenced from both
drivers and board files.  That is why header files defining
platform_data sturectures are placed in "include" directory,
but our top level "include" directory is already too cluttered.

Let's collect platform_data definitions under the directory
"include/dm/platform_data" like Linux gathers ones around under
"include/linux/platform_data".

This commit moves two header files:

  include/serial_mxc.h -> include/dm/platform_data/serial_mxc.h
  include/serial_pl01x.h -> include/dm/platform_data/serial_pl01x.h

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 board/compulab/cm_fx6/cm_fx6.c          |  2 +-
 drivers/serial/serial_mxc.c             |  2 +-
 drivers/serial/serial_pl01x.c           |  2 +-
 include/dm/platform_data/serial_mxc.h   | 14 ++++++++++++++
 include/dm/platform_data/serial_pl01x.h | 27 +++++++++++++++++++++++++++
 include/serial_mxc.h                    | 14 --------------
 include/serial_pl01x.h                  | 27 ---------------------------
 7 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 include/dm/platform_data/serial_mxc.h
 create mode 100644 include/dm/platform_data/serial_pl01x.h
 delete mode 100644 include/serial_mxc.h
 delete mode 100644 include/serial_pl01x.h

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index f77ff48a1c..82681b10eb 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -15,7 +15,6 @@
 #include <netdev.h>
 #include <fdt_support.h>
 #include <sata.h>
-#include <serial_mxc.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
@@ -23,6 +22,7 @@
 #include <asm/imx-common/sata.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
+#include <dm/platform_data/serial_mxc.h>
 #include "common.h"
 #include "../common/eeprom.h"
 
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 9ce24f9f93..d6cf1d874a 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -7,10 +7,10 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <serial_mxc.h>
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <dm/platform_data/serial_mxc.h>
 #include <serial.h>
 #include <linux/compiler.h>
 
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index e6313ad3d3..38dda91021 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -17,7 +17,7 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <serial.h>
-#include <serial_pl01x.h>
+#include <dm/platform_data/serial_pl01x.h>
 #include <linux/compiler.h>
 #include "serial_pl01x_internal.h"
 
diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
new file mode 100644
index 0000000000..7d3ace2f9e
--- /dev/null
+++ b/include/dm/platform_data/serial_mxc.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2014 Google, Inc
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __serial_mxc_h
+#define __serial_mxc_h
+
+/* Information about a serial port */
+struct mxc_serial_platdata {
+	struct mxc_uart *reg;  /* address of registers in physical memory */
+};
+
+#endif
diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
new file mode 100644
index 0000000000..5e068f390b
--- /dev/null
+++ b/include/dm/platform_data/serial_pl01x.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2014 Google, Inc
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __serial_pl01x_h
+#define __serial_pl01x_h
+
+enum pl01x_type {
+	TYPE_PL010,
+	TYPE_PL011,
+};
+
+/*
+ *Information about a serial port
+ *
+ * @base: Register base address
+ * @type: Port type
+ * @clock: Input clock rate, used for calculating the baud rate divisor
+ */
+struct pl01x_serial_platdata {
+	unsigned long base;
+	enum pl01x_type type;
+	unsigned int clock;
+};
+
+#endif
diff --git a/include/serial_mxc.h b/include/serial_mxc.h
deleted file mode 100644
index 7d3ace2f9e..0000000000
--- a/include/serial_mxc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2014 Google, Inc
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __serial_mxc_h
-#define __serial_mxc_h
-
-/* Information about a serial port */
-struct mxc_serial_platdata {
-	struct mxc_uart *reg;  /* address of registers in physical memory */
-};
-
-#endif
diff --git a/include/serial_pl01x.h b/include/serial_pl01x.h
deleted file mode 100644
index 5e068f390b..0000000000
--- a/include/serial_pl01x.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014 Google, Inc
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __serial_pl01x_h
-#define __serial_pl01x_h
-
-enum pl01x_type {
-	TYPE_PL010,
-	TYPE_PL011,
-};
-
-/*
- *Information about a serial port
- *
- * @base: Register base address
- * @type: Port type
- * @clock: Input clock rate, used for calculating the baud rate divisor
- */
-struct pl01x_serial_platdata {
-	unsigned long base;
-	enum pl01x_type type;
-	unsigned int clock;
-};
-
-#endif
-- 
cgit v1.2.3