mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] imx:mmdc:Move imx6-reg include to imx6-mmdc header
@ 2014-04-30 19:11 Christian Hemp
  2014-05-05  7:02 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Hemp @ 2014-04-30 19:11 UTC (permalink / raw)
  To: barebox

Move the imx6-reg.h include to the imx6-mmdc header.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/mach-imx/imx6-mmdc.c              |    1 -
 arch/arm/mach-imx/include/mach/imx6-mmdc.h |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-imx/imx6-mmdc.c b/arch/arm/mach-imx/imx6-mmdc.c
index 9686bee..0e706ce 100644
--- a/arch/arm/mach-imx/imx6-mmdc.c
+++ b/arch/arm/mach-imx/imx6-mmdc.c
@@ -17,7 +17,6 @@
  */
 #include <common.h>
 #include <io.h>
-#include <mach/imx6-regs.h>
 #include <mach/imx6-mmdc.h>
 
 int mmdc_do_write_level_calibration(void)
diff --git a/arch/arm/mach-imx/include/mach/imx6-mmdc.h b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
index 0017174..d07950d 100644
--- a/arch/arm/mach-imx/include/mach/imx6-mmdc.h
+++ b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
@@ -1,6 +1,7 @@
 #ifndef __MACH_MMDC_H
 #define __MACH_MMDC_H
 
+#include <mach/imx6-regs.h>
 
 #define P0_IPS (void __iomem *)MX6_MMDC_P0_BASE_ADDR
 #define P1_IPS (void __iomem *)MX6_MMDC_P1_BASE_ADDR
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] imx:mmdc:Move imx6-reg include to imx6-mmdc header
  2014-04-30 19:11 [PATCH] imx:mmdc:Move imx6-reg include to imx6-mmdc header Christian Hemp
@ 2014-05-05  7:02 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2014-05-05  7:02 UTC (permalink / raw)
  To: Christian Hemp; +Cc: barebox

On Wed, Apr 30, 2014 at 09:11:09PM +0200, Christian Hemp wrote:
> Move the imx6-reg.h include to the imx6-mmdc header.
> 
> Signed-off-by: Christian Hemp <c.hemp@phytec.de>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-imx/imx6-mmdc.c              |    1 -
>  arch/arm/mach-imx/include/mach/imx6-mmdc.h |    1 +
>  2 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx6-mmdc.c b/arch/arm/mach-imx/imx6-mmdc.c
> index 9686bee..0e706ce 100644
> --- a/arch/arm/mach-imx/imx6-mmdc.c
> +++ b/arch/arm/mach-imx/imx6-mmdc.c
> @@ -17,7 +17,6 @@
>   */
>  #include <common.h>
>  #include <io.h>
> -#include <mach/imx6-regs.h>
>  #include <mach/imx6-mmdc.h>
>  
>  int mmdc_do_write_level_calibration(void)
> diff --git a/arch/arm/mach-imx/include/mach/imx6-mmdc.h b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> index 0017174..d07950d 100644
> --- a/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> +++ b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
> @@ -1,6 +1,7 @@
>  #ifndef __MACH_MMDC_H
>  #define __MACH_MMDC_H
>  
> +#include <mach/imx6-regs.h>
>  
>  #define P0_IPS (void __iomem *)MX6_MMDC_P0_BASE_ADDR
>  #define P1_IPS (void __iomem *)MX6_MMDC_P1_BASE_ADDR
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-05-05  7:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-30 19:11 [PATCH] imx:mmdc:Move imx6-reg include to imx6-mmdc header Christian Hemp
2014-05-05  7:02 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox