[U-Boot] [PATCH v2 3/4] mxs: rename regs-clkctrl.h to regs-clkctrl-mx28.h

[Stefano Babic]

On 13/08/2012 21:53, Otavio Salvador wrote:
> The CLKCTRL registers are SoC specific so we ought to have it clear on
> filename.
> 
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
> Changes in v2:
> - no changes
> 

Hi Otavio,

>  arch/arm/include/asm/arch-mxs/imx-regs.h                             |    2 +-
>  .../arm/include/asm/arch-mxs/{regs-clkctrl.h => regs-clkctrl-mx28.h} |    0
>  drivers/usb/host/ehci-mxs.c                                          |    2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename arch/arm/include/asm/arch-mxs/{regs-clkctrl.h => regs-clkctrl-mx28.h} (100%)
> 
> diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h
> index 37d0a93..5e1901e 100644
> --- a/arch/arm/include/asm/arch-mxs/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mxs/imx-regs.h
> @@ -26,7 +26,7 @@
>  #include <asm/arch/regs-apbh.h>
>  #include <asm/arch/regs-base.h>
>  #include <asm/arch/regs-bch.h>
> -#include <asm/arch/regs-clkctrl.h>
> +#include <asm/arch/regs-clkctrl-mx28.h>
>  #include <asm/arch/regs-digctl.h>
>  #include <asm/arch/regs-gpmi.h>
>  #include <asm/arch/regs-i2c.h>
> diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-mxs/regs-clkctrl.h
> rename to arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
> diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
> index e263747..6e21669 100644
> --- a/drivers/usb/host/ehci-mxs.c
> +++ b/drivers/usb/host/ehci-mxs.c
> @@ -23,7 +23,7 @@
>  #include <asm/io.h>
>  #include <asm/arch/regs-common.h>
>  #include <asm/arch/regs-base.h>
> -#include <asm/arch/regs-clkctrl.h>
> +#include <asm/arch/regs-clkctrl-mx28.h>
>  #include <asm/arch/regs-usb.h>
>  #include <asm/arch/regs-usbphy.h>

Well, this is not clear - maybe because I do not know your plan. I
suppose that general header, that is imx-regs.h, and drivers such as
ehci-mxs should not include SOC specific headers, so that they can be
used with both SOCs. The indirection should be done in a deeper level.

Both includes currently headers referred to the specific function (gpmi,
bch, base, ...), not to a specific SOC. Then I am expecting that inside
regs-clkctrl.h (or another header) there are details for both SOCs, or
if you want to split they completely, regs-clkctrl.h is something like

regs-clkctrl.h:

#ifdef MX28
include <asm/arch/regs-clkctrl-mx28.h>
#else #ifdef MX23
include <asm/arch/regs-clkctrl-mx23.h>
....

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
=====================================================================