| Message ID | 1414056064-10309-1-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Masahiro, On 23 October 2014 03:21, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > The platform_data structures 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" as Linux gather them 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> > Cc: Simon Glass <sjg@chromium.org> > --- > > 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..a56777b 100644 > --- a/board/compulab/cm_fx6/cm_fx6.c > +++ b/board/compulab/cm_fx6/cm_fx6.c > @@ -15,7 +15,7 @@ > #include <netdev.h> > #include <fdt_support.h> > #include <sata.h> > -#include <serial_mxc.h> > +#include <dm/platform_data/serial_mxc.h> Can we please put dm below asm in the sort order? > #include <asm/arch/crm_regs.h> > #include <asm/arch/sys_proto.h> > #include <asm/arch/iomux.h> > diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c > index 9ce24f9..0c761d7 100644 > --- a/drivers/serial/serial_mxc.c > +++ b/drivers/serial/serial_mxc.c > @@ -7,7 +7,7 @@ > #include <common.h> > #include <dm.h> > #include <errno.h> > -#include <serial_mxc.h> > +#include <dm/platform_data/serial_mxc.h> > #include <watchdog.h> > #include <asm/arch/imx-regs.h> > #include <asm/arch/clock.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 > Regards, Simon
Hi Simon, 2014-10-24 3:31 GMT+09:00 Simon Glass <sjg@chromium.org>: >> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c >> index f77ff48..a56777b 100644 >> --- a/board/compulab/cm_fx6/cm_fx6.c >> +++ b/board/compulab/cm_fx6/cm_fx6.c >> @@ -15,7 +15,7 @@ >> #include <netdev.h> >> #include <fdt_support.h> >> #include <sata.h> >> -#include <serial_mxc.h> >> +#include <dm/platform_data/serial_mxc.h> > > Can we please put dm below asm in the sort order? Sure, I will send v2, but could you teach me how header files should generally be sorted? Do you mean "global" to "local" order? I just want to learn your lesson.
Hi Masahiro, On 23 October 2014 12:55, Masahiro YAMADA <yamada.m@jp.panasonic.com> wrote: > Hi Simon, > > > 2014-10-24 3:31 GMT+09:00 Simon Glass <sjg@chromium.org>: >>> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c >>> index f77ff48..a56777b 100644 >>> --- a/board/compulab/cm_fx6/cm_fx6.c >>> +++ b/board/compulab/cm_fx6/cm_fx6.c >>> @@ -15,7 +15,7 @@ >>> #include <netdev.h> >>> #include <fdt_support.h> >>> #include <sata.h> >>> -#include <serial_mxc.h> >>> +#include <dm/platform_data/serial_mxc.h> >> >> Can we please put dm below asm in the sort order? > > Sure, I will send v2, > but could you teach me how header files should generally be sorted? > > Do you mean "global" to "local" order? > I just want to learn your lesson. Well this is what I do. I'm not sure if it is documented anywhere, or even if everyone agrees. common.h a-z for things in include/ <asm/xxx.h> <asm/arch/yyy.h> <dm/...> <linux/...> "a-z local-things.h" Regards, Simon
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index f77ff48..a56777b 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -15,7 +15,7 @@ #include <netdev.h> #include <fdt_support.h> #include <sata.h> -#include <serial_mxc.h> +#include <dm/platform_data/serial_mxc.h> #include <asm/arch/crm_regs.h> #include <asm/arch/sys_proto.h> #include <asm/arch/iomux.h> diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 9ce24f9..0c761d7 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <errno.h> -#include <serial_mxc.h> +#include <dm/platform_data/serial_mxc.h> #include <watchdog.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.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
The platform_data structures 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" as Linux gather them 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> Cc: Simon Glass <sjg@chromium.org> --- 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%)