Skip to contentSkip to conversation

dm: move platform data headers to include/dm/platform_data

PATCH New Masahiro Yamada 3 participants 3 messages Oct 24, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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

---

Changes in v2:
- Move #include <dm/platform_data/foo.h> below <asm/bar.h>

 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   | 0
 include/{ => dm/platform_data}/serial_pl01x.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{ => dm/platform_data}/serial_mxc.h (100%)
 rename include/{ => dm/platform_data}/serial_pl01x.h (100%)
board/compulab/cm_fx6/cm_fx6.c +1 -1
index f77ff48..82681b1 100644
@@ -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"
 
drivers/serial/serial_mxc.c +1 -1
index 9ce24f9..d6cf1d8 100644
@@ -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>
 
drivers/serial/serial_pl01x.c +1 -1
index e6313ad..38dda91 100644
@@ -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"
 
include/dm/platform_data/serial_mxc.h renamed from include/serial_mxc.h +0 -0
similarity index 100%
rename from include/serial_mxc.h
rename to include/dm/platform_data/serial_mxc.h
include/dm/platform_data/serial_pl01x.h renamed from include/serial_pl01x.h +0 -0
similarity index 100%
rename from include/serial_pl01x.h
rename to include/dm/platform_data/serial_pl01x.h
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 dm: move platform data headers to include/dm/platform_data

Quoted 11 lines · Masahiro Yamada

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:

Quoted 8 lines

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

---

Changes in v2:
- Move #include <dm/platform_data/foo.h> below <asm/bar.h>

Applied to u-boot-dm/master, thanks!

Quoted 70 lines
 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   | 0
 include/{ => dm/platform_data}/serial_pl01x.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{ => dm/platform_data}/serial_mxc.h (100%)
 rename include/{ => dm/platform_data}/serial_pl01x.h (100%)
board/compulab/cm_fx6/cm_fx6.c +1 -1
index f77ff48..82681b1 100644
@@ -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"
 
drivers/serial/serial_mxc.c +1 -1
index 9ce24f9..d6cf1d8 100644
@@ -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>
 
drivers/serial/serial_pl01x.c +1 -1
index e6313ad..38dda91 100644
@@ -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"
 
include/dm/platform_data/serial_mxc.h renamed from include/serial_mxc.h +0 -0
similarity index 100%
rename from include/serial_mxc.h
rename to include/dm/platform_data/serial_mxc.h
include/dm/platform_data/serial_pl01x.h renamed from include/serial_pl01x.h +0 -1
similarity index 100%
rename from include/serial_pl01x.h
rename to include/dm/platform_data/serial_pl01x.h
--

1.9.1

#2 lore raw

PATCH v2 1/1 dm: move platform data headers to include/dm/platform_data

In reply to Masahiro Yamada

Hi Masahiro,

include/dm/platform_data/serial_pl01x.h

Quoted 87 lines · Masahiro Yamada

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

---

Changes in v2:
- Move #include <dm/platform_data/foo.h> below <asm/bar.h>

 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   | 0
 include/{ => dm/platform_data}/serial_pl01x.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{ => dm/platform_data}/serial_mxc.h (100%)
 rename include/{ => dm/platform_data}/serial_pl01x.h (100%)
board/compulab/cm_fx6/cm_fx6.c +1 -1
index f77ff48..82681b1 100644
@@ -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"
 
drivers/serial/serial_mxc.c +1 -1
index 9ce24f9..d6cf1d8 100644
@@ -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>
 
drivers/serial/serial_pl01x.c +1 -1
index e6313ad..38dda91 100644
@@ -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"
 
include/dm/platform_data/serial_mxc.h renamed from include/serial_mxc.h +0 -0
similarity index 100%
rename from include/serial_mxc.h
rename to include/dm/platform_data/serial_mxc.h
include/dm/platform_data/serial_pl01x.h renamed from include/serial_pl01x.h +0 -0
similarity index 100%
rename from include/serial_pl01x.h
rename to include/dm/platform_data/serial_pl01x.h

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================