* [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data
@ 2014-10-24 3:41 Masahiro Yamada
2014-10-24 3:54 ` Simon Glass
2014-10-24 7:45 ` Stefano Babic
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2014-10-24 3:41 UTC (permalink / raw)
To: u-boot
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>
---
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%)
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index f77ff48..82681b1 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 9ce24f9..d6cf1d8 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 e6313ad..38dda91 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/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
similarity index 100%
rename from include/serial_mxc.h
rename to include/dm/platform_data/serial_mxc.h
diff --git a/include/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
similarity index 100%
rename from include/serial_pl01x.h
rename to include/dm/platform_data/serial_pl01x.h
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data
2014-10-24 3:41 [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data Masahiro Yamada
@ 2014-10-24 3:54 ` Simon Glass
2014-10-24 7:45 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2014-10-24 3:54 UTC (permalink / raw)
To: u-boot
On 23 October 2014 21:41, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote:
> 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>
> ---
>
> Changes in v2:
> - Move #include <dm/platform_data/foo.h> below <asm/bar.h>
Acked-by: Simon Glass <sjg@chromium.org>
Applied to u-boot-dm/master, thanks!
>
> 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%)
>
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index f77ff48..82681b1 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 9ce24f9..d6cf1d8 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 e6313ad..38dda91 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/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
> similarity index 100%
> rename from include/serial_mxc.h
> rename to include/dm/platform_data/serial_mxc.h
> diff --git a/include/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
> similarity index 100%
> rename from include/serial_pl01x.h
> rename to include/dm/platform_data/serial_pl01x.h
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data
2014-10-24 3:41 [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data Masahiro Yamada
2014-10-24 3:54 ` Simon Glass
@ 2014-10-24 7:45 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2014-10-24 7:45 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 24/10/2014 05:41, Masahiro Yamada wrote:
> 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>
> ---
>
> 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%)
>
> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
> index f77ff48..82681b1 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 9ce24f9..d6cf1d8 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 e6313ad..38dda91 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/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
> similarity index 100%
> rename from include/serial_mxc.h
> rename to include/dm/platform_data/serial_mxc.h
> diff --git a/include/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
> similarity index 100%
> rename from include/serial_pl01x.h
> rename to include/dm/platform_data/serial_pl01x.h
>
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-24 7:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 3:41 [U-Boot] [PATCH v2] dm: move platform data headers to include/dm/platform_data Masahiro Yamada
2014-10-24 3:54 ` Simon Glass
2014-10-24 7:45 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox