[U-Boot] [PATCH v2 1/4] mxs: Remove not required explicit iomux-mx28.h include

[U-Boot] [PATCH v2 1/4] mxs: Remove not required explicit iomux-mx28.h include

[Otavio Salvador]

The iomux header is included on sys_proto.h so to avoid SoC specific
header inclusion.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- no changes

 arch/arm/cpu/arm926ejs/mxs/spl_boot.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 46f6770..84d4a17 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -26,7 +26,6 @@
 #include <common.h>
 #include <config.h>
 #include <asm/io.h>
-#include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-- 
1.7.10.4

[U-Boot] [PATCH v2 2/4] mxs: Remove not required include of iomux-mx28.h

[Otavio Salvador]

The iomux-mx28.h include is not required on spl_mem_init.c so it has
been droped.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- change short description to clearly describe what has been done

 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index 88d1abe..e693145 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -26,7 +26,6 @@
 #include <common.h>
 #include <config.h>
 #include <asm/io.h>
-#include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 
 #include "mxs_init.h"
-- 
1.7.10.4

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

[Otavio Salvador]

The CLKCTRL registers are SoC specific so we ought to have it clear on
filename.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- no changes

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

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

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

[Otavio Salvador]

On Tue, Aug 14, 2012 at 5:31 AM, Stefano Babic <sbabic@denx.de> wrote:
> 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@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>
> ....

This is indeed the idea; I didn't include this change yet to add it
when including mx23 changes. If you prefer I can send a new version of
it moving the .h to a deeper level. I am OK in doing that as it'd be
done anyway later.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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

[Stefano Babic]

On 14/08/2012 14:31, Otavio Salvador wrote:

>> regs-clkctrl.h:
>>
>> #ifdef MX28
>> include <asm/arch/regs-clkctrl-mx28.h>
>> #else #ifdef MX23
>> include <asm/arch/regs-clkctrl-mx23.h>
>> ....
> 
> This is indeed the idea; I didn't include this change yet to add it
> when including mx23 changes. If you prefer I can send a new version of
> it moving the .h to a deeper level. I am OK in doing that as it'd be
> done anyway later.

Well, this is not a stop point - I wanted only to understand which is
the final result. I think we agree all what we want. I have no problem
to take this as temporary patch, fixed by another patch later.

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

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

[Otavio Salvador]

On Tue, Aug 14, 2012 at 9:53 AM, Stefano Babic <sbabic@denx.de> wrote:
> Well, this is not a stop point - I wanted only to understand which is
> the final result. I think we agree all what we want. I have no problem
> to take this as temporary patch, fixed by another patch later.

Great; so please take this one and I send new patches once I finish
the mx23 addition.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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

[Marek Vasut]

Dear 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@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>
> ....

The other header isn't present yet tho

> Best regards,
> Stefano Babic

Best regards,
Marek Vasut

[U-Boot] [PATCH v2 4/4] mxs: Convert sys_proto.h prefixes to 'mxs'

[Otavio Salvador]

The sys_proto.h functions (except the boot modes) are compatible with
i.MX233 and i.MX28 so we use 'mxs' prefix for its methods.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- no changes

 arch/arm/cpu/arm926ejs/mxs/mxs.c          |   32 ++++++++++++++---------------
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c     |    6 +++---
 arch/arm/cpu/arm926ejs/mxs/timer.c        |    2 +-
 arch/arm/include/asm/arch-mxs/sys_proto.h |   20 +++++++++---------
 board/bluegiga/apx4devkit/apx4devkit.c    |    2 +-
 drivers/dma/apbh_dma.c                    |    4 ++--
 drivers/i2c/mxs_i2c.c                     |    2 +-
 drivers/mmc/mxsmmc.c                      |    2 +-
 drivers/mtd/nand/mxs_nand.c               |    6 +++---
 drivers/rtc/mxsrtc.c                      |    4 ++--
 drivers/spi/mxs_spi.c                     |    8 ++++----
 11 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index a61f75b..c028e5e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -41,8 +41,8 @@ DECLARE_GLOBAL_DATA_PTR;
 /* 1 second delay should be plenty of time for block reset. */
 #define	RESET_MAX_TIMEOUT	1000000
 
-#define	MX28_BLOCK_SFTRST	(1 << 31)
-#define	MX28_BLOCK_CLKGATE	(1 << 30)
+#define	MXS_BLOCK_SFTRST	(1 << 31)
+#define	MXS_BLOCK_CLKGATE	(1 << 30)
 
 /* Lowlevel init isn't used on i.MX28, so just have a dummy here */
 inline void lowlevel_init(void) {}
@@ -81,7 +81,7 @@ void enable_caches(void)
 #endif
 }
 
-int mx28_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout)
+int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 {
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == mask)
@@ -92,7 +92,7 @@ int mx28_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 	return !timeout;
 }
 
-int mx28_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout)
+int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 {
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == 0)
@@ -103,34 +103,34 @@ int mx28_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 	return !timeout;
 }
 
-int mx28_reset_block(struct mxs_register_32 *reg)
+int mxs_reset_block(struct mxs_register_32 *reg)
 {
 	/* Clear SFTRST */
-	writel(MX28_BLOCK_SFTRST, &reg->reg_clr);
+	writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
 
-	if (mx28_wait_mask_clr(reg, MX28_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+	if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
 		return 1;
 
 	/* Clear CLKGATE */
-	writel(MX28_BLOCK_CLKGATE, &reg->reg_clr);
+	writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
 
 	/* Set SFTRST */
-	writel(MX28_BLOCK_SFTRST, &reg->reg_set);
+	writel(MXS_BLOCK_SFTRST, &reg->reg_set);
 
 	/* Wait for CLKGATE being set */
-	if (mx28_wait_mask_set(reg, MX28_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+	if (mxs_wait_mask_set(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
 		return 1;
 
 	/* Clear SFTRST */
-	writel(MX28_BLOCK_SFTRST, &reg->reg_clr);
+	writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
 
-	if (mx28_wait_mask_clr(reg, MX28_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+	if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
 		return 1;
 
 	/* Clear CLKGATE */
-	writel(MX28_BLOCK_CLKGATE, &reg->reg_clr);
+	writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
 
-	if (mx28_wait_mask_clr(reg, MX28_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+	if (mxs_wait_mask_clr(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
 		return 1;
 
 	return 0;
@@ -229,7 +229,7 @@ int print_cpuinfo(void)
 		get_cpu_type(),
 		get_cpu_rev(),
 		mxc_get_clock(MXC_ARM_CLK) / 1000000);
-	printf("BOOT:  %s\n", mx28_boot_modes[data->boot_mode_idx].mode);
+	printf("BOOT:  %s\n", mxs_boot_modes[data->boot_mode_idx].mode);
 	return 0;
 }
 #endif
@@ -299,7 +299,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 
 	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
 
-	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+	if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
 				MXS_OCOTP_MAX_TIMEOUT)) {
 		printf("MXS FEC: Can't get MAC from OCOTP\n");
 		return;
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 84d4a17..ddafddb 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -82,9 +82,9 @@ uint8_t mxs_get_bootmode_index(void)
 	bootmode |= (gpio_get_value(MX28_PAD_LCD_D04__GPIO_1_4) ? 1 : 0) << 4;
 	bootmode |= (gpio_get_value(MX28_PAD_LCD_D05__GPIO_1_5) ? 1 : 0) << 5;
 
-	for (i = 0; i < ARRAY_SIZE(mx28_boot_modes); i++) {
-		masked = bootmode & mx28_boot_modes[i].boot_mask;
-		if (masked == mx28_boot_modes[i].boot_pads)
+	for (i = 0; i < ARRAY_SIZE(mxs_boot_modes); i++) {
+		masked = bootmode & mxs_boot_modes[i].boot_mask;
+		if (masked == mxs_boot_modes[i].boot_pads)
 			break;
 	}
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index c4b0f5e..4ed75e6 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -66,7 +66,7 @@ int timer_init(void)
 		(struct mxs_timrot_regs *)MXS_TIMROT_BASE;
 
 	/* Reset Timers and Rotary Encoder module */
-	mx28_reset_block(&timrot_regs->hw_timrot_rotctrl_reg);
+	mxs_reset_block(&timrot_regs->hw_timrot_rotctrl_reg);
 
 	/* Set fixed_count to 0 */
 	writel(0, &timrot_regs->hw_timrot_fixed_count0);
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 91645eb..9d1e599 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -1,5 +1,5 @@
 /*
- * Freescale i.MX28 MX28 specific functions
+ * Freescale i.MX233/i.MX28 specific functions
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef __MX28_H__
-#define __MX28_H__
+#ifndef __SYS_PROTO_H__
+#define __SYS_PROTO_H__
 
-int mx28_reset_block(struct mxs_register_32 *reg);
-int mx28_wait_mask_set(struct mxs_register_32 *reg,
+int mxs_reset_block(struct mxs_register_32 *reg);
+int mxs_wait_mask_set(struct mxs_register_32 *reg,
 		       uint32_t mask,
 		       int timeout);
-int mx28_wait_mask_clr(struct mxs_register_32 *reg,
+int mxs_wait_mask_clr(struct mxs_register_32 *reg,
 		       uint32_t mask,
 		       int timeout);
 
@@ -39,13 +39,13 @@ void mxs_common_spl_init(const iomux_cfg_t *iomux_setup,
 			const unsigned int iomux_size);
 #endif
 
-struct mx28_pair {
+struct mxs_pair {
 	uint8_t	boot_pads;
 	uint8_t boot_mask;
 	const char *mode;
 };
 
-static const struct mx28_pair mx28_boot_modes[] = {
+static const struct mxs_pair mxs_boot_modes[] = {
 	{ 0x00, 0x0f, "USB #0" },
 	{ 0x01, 0x1f, "I2C #0, master, 3V3" },
 	{ 0x11, 0x1f, "I2C #0, master, 1V8" },
@@ -69,6 +69,6 @@ struct mxs_spl_data {
 	uint32_t	mem_dram_size;
 };
 
-int mx28_dram_init(void);
+int mxs_dram_init(void);
 
-#endif	/* __MX28_H__ */
+#endif	/* __SYS_PROTO_H__ */
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 87f3f35..5a1042e 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -130,7 +130,7 @@ void get_board_serial(struct tag_serialnr *serialnr)
 
 	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
 
-	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+	if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
 		MXS_OCOTP_MAX_TIMEOUT)) {
 		printf("MXS: Can't get serial number from OCOTP\n");
 		return;
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 38eff4f..ca5a32f 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -512,7 +512,7 @@ static int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan)
 	if (ret)
 		return ret;
 
-	if (mx28_wait_mask_set(&apbh_regs->hw_apbh_ctrl1_reg,
+	if (mxs_wait_mask_set(&apbh_regs->hw_apbh_ctrl1_reg,
 				1 << chan, timeout)) {
 		ret = -ETIMEDOUT;
 		mxs_dma_reset(chan);
@@ -557,7 +557,7 @@ void mxs_dma_init(void)
 	struct mxs_apbh_regs *apbh_regs =
 		(struct mxs_apbh_regs *)MXS_APBH_BASE;
 
-	mx28_reset_block(&apbh_regs->hw_apbh_ctrl0_reg);
+	mxs_reset_block(&apbh_regs->hw_apbh_ctrl0_reg);
 
 #ifdef CONFIG_APBH_DMA_BURST8
 	writel(APBH_CTRL0_AHB_BURST8_EN,
diff --git a/drivers/i2c/mxs_i2c.c b/drivers/i2c/mxs_i2c.c
index 5d61d7a..2a193c2 100644
--- a/drivers/i2c/mxs_i2c.c
+++ b/drivers/i2c/mxs_i2c.c
@@ -41,7 +41,7 @@ void mxs_i2c_reset(void)
 	struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE;
 	int ret;
 
-	ret = mx28_reset_block(&i2c_regs->hw_i2c_ctrl0_reg);
+	ret = mxs_reset_block(&i2c_regs->hw_i2c_ctrl0_reg);
 	if (ret) {
 		debug("MXS I2C: Block reset timeout\n");
 		return;
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c
index 018939f..9a98c6b 100644
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -336,7 +336,7 @@ static int mxsmmc_init(struct mmc *mmc)
 	struct mxs_ssp_regs *ssp_regs = priv->regs;
 
 	/* Reset SSP */
-	mx28_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
+	mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
 
 	/* 8 bits word length in MMC mode */
 	clrsetbits_le32(&ssp_regs->hw_ssp_ctrl1,
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 807c9fd..bf9414f 100644
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -237,7 +237,7 @@ static int mxs_nand_wait_for_bch_complete(void)
 	int timeout = MXS_NAND_BCH_TIMEOUT;
 	int ret;
 
-	ret = mx28_wait_mask_set(&bch_regs->hw_bch_ctrl_reg,
+	ret = mxs_wait_mask_set(&bch_regs->hw_bch_ctrl_reg,
 		BCH_CTRL_COMPLETE_IRQ, timeout);
 
 	writel(BCH_CTRL_COMPLETE_IRQ, &bch_regs->hw_bch_ctrl_clr);
@@ -972,7 +972,7 @@ static int mxs_nand_scan_bbt(struct mtd_info *mtd)
 	uint32_t tmp;
 
 	/* Configure BCH and set NFC geometry */
-	mx28_reset_block(&bch_regs->hw_bch_ctrl_reg);
+	mxs_reset_block(&bch_regs->hw_bch_ctrl_reg);
 
 	/* Configure layout 0 */
 	tmp = (mxs_nand_ecc_chunk_cnt(mtd->writesize) - 1)
@@ -1080,7 +1080,7 @@ int mxs_nand_init(struct mxs_nand_info *info)
 	}
 
 	/* Reset the GPMI block. */
-	mx28_reset_block(&gpmi_regs->hw_gpmi_ctrl0_reg);
+	mxs_reset_block(&gpmi_regs->hw_gpmi_ctrl0_reg);
 
 	/*
 	 * Choose NAND mode, set IRQ polarity, disable write protection and
diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index 72f7400..ffefb91 100644
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -41,7 +41,7 @@ int mxs_rtc_set_time(uint32_t secs)
 	 * is taken from the linux kernel driver for the STMP37xx RTC since
 	 * documentation doesn't mention it.
 	 */
-	ret = mx28_wait_mask_clr(&rtc_regs->hw_rtc_stat_reg,
+	ret = mxs_wait_mask_clr(&rtc_regs->hw_rtc_stat_reg,
 		0x80 << RTC_STAT_STALE_REGS_OFFSET, MXS_RTC_MAX_TIMEOUT);
 
 	if (ret)
@@ -80,7 +80,7 @@ void rtc_reset(void)
 	mxs_rtc_set_time(0);
 
 	/* Reset the RTC block */
-	ret = mx28_reset_block(&rtc_regs->hw_rtc_ctrl_reg);
+	ret = mxs_reset_block(&rtc_regs->hw_rtc_ctrl_reg);
 	if (ret)
 		printf("MXS RTC: Block reset timeout\n");
 }
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index bd834fb..a037c13 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -139,7 +139,7 @@ int spi_claim_bus(struct spi_slave *slave)
 	struct mxs_ssp_regs *ssp_regs = mxs_slave->regs;
 	uint32_t reg = 0;
 
-	mx28_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
+	mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg);
 
 	writel(SSP_CTRL0_BUS_WIDTH_ONE_BIT, &ssp_regs->hw_ssp_ctrl0);
 
@@ -193,7 +193,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave,
 
 		writel(SSP_CTRL0_RUN, &ssp_regs->hw_ssp_ctrl0_set);
 
-		if (mx28_wait_mask_set(&ssp_regs->hw_ssp_ctrl0_reg,
+		if (mxs_wait_mask_set(&ssp_regs->hw_ssp_ctrl0_reg,
 			SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) {
 			printf("MXS SPI: Timeout waiting for start\n");
 			return -ETIMEDOUT;
@@ -205,7 +205,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave,
 		writel(SSP_CTRL0_DATA_XFER, &ssp_regs->hw_ssp_ctrl0_set);
 
 		if (!write) {
-			if (mx28_wait_mask_clr(&ssp_regs->hw_ssp_status_reg,
+			if (mxs_wait_mask_clr(&ssp_regs->hw_ssp_status_reg,
 				SSP_STATUS_FIFO_EMPTY, MXS_SPI_MAX_TIMEOUT)) {
 				printf("MXS SPI: Timeout waiting for data\n");
 				return -ETIMEDOUT;
@@ -215,7 +215,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave,
 			data++;
 		}
 
-		if (mx28_wait_mask_clr(&ssp_regs->hw_ssp_ctrl0_reg,
+		if (mxs_wait_mask_clr(&ssp_regs->hw_ssp_ctrl0_reg,
 			SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) {
 			printf("MXS SPI: Timeout waiting for finish\n");
 			return -ETIMEDOUT;
-- 
1.7.10.4

[U-Boot] [PATCH v2 1/4] mxs: Remove not required explicit iomux-mx28.h include

[Marek Vasut]

Dear Otavio Salvador,

> The iomux header is included on sys_proto.h so to avoid SoC specific
> header inclusion.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Acked-by: Marek Vasut <marex@denx.de>

Stefano, can you please apply?

Best regards,
Marek Vasut

[U-Boot] [PATCH v2 1/4] mxs: Remove not required explicit iomux-mx28.h include

[Stefano Babic]

On 13/08/2012 21:53, Otavio Salvador wrote:
> The iomux header is included on sys_proto.h so to avoid SoC specific
> header inclusion.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> Changes in v2:
> - no changes
> 
>  arch/arm/cpu/arm926ejs/mxs/spl_boot.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> index 46f6770..84d4a17 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> @@ -26,7 +26,6 @@
>  #include <common.h>
>  #include <config.h>
>  #include <asm/io.h>
> -#include <asm/arch/iomux-mx28.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/sys_proto.h>
>  #include <asm/gpio.h>
> 

Applied to u-boot-imx (the whole series), thanks.

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