All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC
@ 2012-05-12 23:40 Otavio Salvador
  2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
                   ` (8 more replies)
  0 siblings, 9 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

This patchset include some small fixes found while looking at code to
start converting it to use a common mxs SoC code in preparation for
inclusion of i.MX23 support.

Otavio Salvador (8):
  m28evk: use same notation to alloc the 128kB stack
  m28evk: use "M28EVK U-Boot =>" as prompt
  mx28evk: ensure command definition is in alphabetic order
  mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS
    SoCs
  m28evk: fix board config include guardian macro name
  mx28evk: fix board config include guardian macro name
  mxs: reorganize source directory for easy sharing of code in i.MXS
    SoCs
  mxs: prefix register acessor macros with 'mxs' prefix

 arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile      |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c       |    4 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c       |    6 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c        |    6 +-
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h   |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c    |    0
 .../cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c   |    0
 .../arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c |    0
 .../cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c   |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S       |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c       |    0
 .../arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds |    2 +-
 .../include/asm/{arch-mx28 => arch-mxs}/clock.h    |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h |    0
 .../arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h |    0
 .../include/asm/{arch-mx28 => arch-mxs}/imx-regs.h |    0
 .../asm/{arch-mx28 => arch-mxs}/iomux-mx28.h       |    0
 .../include/asm/{arch-mx28 => arch-mxs}/iomux.h    |    0
 .../asm/{arch-mx28 => arch-mxs}/regs-apbh.h        |  254 ++++++++++----------
 .../asm/{arch-mx28 => arch-mxs}/regs-base.h        |    0
 .../include/asm/{arch-mx28 => arch-mxs}/regs-bch.h |   42 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h     |   58 ++---
 .../asm/{arch-mx28 => arch-mxs}/regs-common.h      |   34 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-digctl.h      |   50 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-gpmi.h        |   26 +-
 .../include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h |   28 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-lcdif.h       |   64 ++---
 .../asm/{arch-mx28 => arch-mxs}/regs-lradc.h       |   48 ++--
 .../asm/{arch-mx28 => arch-mxs}/regs-ocotp.h       |   86 +++----
 .../asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h     |  168 ++++++-------
 .../asm/{arch-mx28 => arch-mxs}/regs-power.h       |   28 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h |   28 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h |   40 +--
 .../asm/{arch-mx28 => arch-mxs}/regs-timrot.h      |   38 +--
 .../include/asm/{arch-mx28 => arch-mxs}/regs-usb.h |    0
 .../asm/{arch-mx28 => arch-mxs}/regs-usbphy.h      |   20 +-
 .../asm/{arch-mx28 => arch-mxs}/sys_proto.h        |    6 +-
 boards.cfg                                         |    4 +-
 doc/README.m28                                     |    4 +-
 doc/README.mx28evk                                 |    4 +-
 drivers/gpio/mxs_gpio.c                            |   16 +-
 drivers/usb/host/ehci-mxs.c                        |    8 +-
 include/configs/m28evk.h                           |   14 +-
 include/configs/mx28evk.h                          |   12 +-
 tools/mxsboot.c                                    |  110 ++++-----
 45 files changed, 604 insertions(+), 604 deletions(-)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (98%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (94%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c (97%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h (77%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h (92%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h (89%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h (78%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h (79%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h (95%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h (94%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h (84%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h (96%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h (72%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h (93%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h (97%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h (92%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h (95%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h (90%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h (95%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h (93%)

-- 
1.7.10

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-29 20:44   ` Wolfgang Denk
  2012-06-13  9:06   ` Stefano Babic
  2012-05-12 23:40 ` [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt Otavio Salvador
                   ` (7 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/m28evk.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c62f4d0..7472ddc 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -88,7 +88,7 @@
 #define	CONFIG_NR_DRAM_BANKS		1		/* 1 bank of DRAM */
 #define	PHYS_SDRAM_1			0x40000000	/* Base address */
 #define	PHYS_SDRAM_1_SIZE		0x20000000	/* Max 512 MB RAM */
-#define	CONFIG_STACKSIZE		0x00010000	/* 128 KB stack */
+#define	CONFIG_STACKSIZE		(128 * 1024)	/* 128 KB stack */
 #define	CONFIG_SYS_MALLOC_LEN		0x00400000	/* 4 MB for malloc */
 #define	CONFIG_SYS_GBL_DATA_SIZE	128		/* Initial data */
 #define	CONFIG_SYS_MEMTEST_START	0x40000000	/* Memtest start adr */
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
  2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 17:11   ` Marek Vasut
  2012-05-29 20:41   ` Wolfgang Denk
  2012-05-12 23:40 ` [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order Otavio Salvador
                   ` (6 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/m28evk.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 7472ddc..ebf7e39 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -114,7 +114,7 @@
  * U-Boot general configurations
  */
 #define	CONFIG_SYS_LONGHELP
-#define	CONFIG_SYS_PROMPT	"=> "
+#define	CONFIG_SYS_PROMPT	"M28EVK U-Boot => "
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O buffer size */
 #define	CONFIG_SYS_PBSIZE	\
 	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
  2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
  2012-05-12 23:40 ` [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 19:29   ` Fabio Estevam
  2012-06-13  9:06   ` Stefano Babic
  2012-05-12 23:40 ` [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Otavio Salvador
                   ` (5 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/mx28evk.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..5ccfe70 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -54,11 +54,11 @@
 #include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_FAT
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (2 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 17:12   ` Marek Vasut
  2012-05-29 20:44   ` Wolfgang Denk
  2012-05-12 23:40 ` [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name Otavio Salvador
                   ` (4 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 tools/mxsboot.c |  110 +++++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/tools/mxsboot.c b/tools/mxsboot.c
index 6c05aa4..9661a48 100644
--- a/tools/mxsboot.c
+++ b/tools/mxsboot.c
@@ -1,5 +1,5 @@
 /*
- * Freescale i.MX28 image generator
+ * Freescale i.MXS image generator
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
@@ -60,13 +60,13 @@ uint32_t sd_sector = 2048;
  */
 #define	MAX_BOOTSTREAM_SIZE	(1 * 1024 * 1024)
 
-/* i.MX28 NAND controller-specific constants. DO NOT TWEAK! */
+/* i.MXS NAND controller-specific constants. DO NOT TWEAK! */
 #define	MXS_NAND_DMA_DESCRIPTOR_COUNT		4
 #define	MXS_NAND_CHUNK_DATA_CHUNK_SIZE		512
 #define	MXS_NAND_METADATA_SIZE			10
 #define	MXS_NAND_COMMAND_BUFFER_SIZE		32
 
-struct mx28_nand_fcb {
+struct mxs_nand_fcb {
 	uint32_t		checksum;
 	uint32_t		fingerprint;
 	uint32_t		version;
@@ -111,7 +111,7 @@ struct mx28_nand_fcb {
 	uint32_t		bb_marker_physical_offset;
 };
 
-struct mx28_nand_dbbt {
+struct mxs_nand_dbbt {
 	uint32_t		checksum;
 	uint32_t		fingerprint;
 	uint32_t		version;
@@ -119,13 +119,13 @@ struct mx28_nand_dbbt {
 	uint32_t		number_2k_pages_bb;
 };
 
-struct mx28_nand_bbt {
+struct mxs_nand_bbt {
 	uint32_t		nand;
 	uint32_t		number_bb;
 	uint32_t		badblock[510];
 };
 
-struct mx28_sd_drive_info {
+struct mxs_sd_drive_info {
 	uint32_t		chip_num;
 	uint32_t		drive_type;
 	uint32_t		tag;
@@ -133,20 +133,20 @@ struct mx28_sd_drive_info {
 	uint32_t		sector_count;
 };
 
-struct mx28_sd_config_block {
+struct mxs_sd_config_block {
 	uint32_t			signature;
 	uint32_t			primary_boot_tag;
 	uint32_t			secondary_boot_tag;
 	uint32_t			num_copies;
-	struct mx28_sd_drive_info	drv_info[1];
+	struct mxs_sd_drive_info	drv_info[1];
 };
 
-static inline uint32_t mx28_nand_ecc_size_in_bits(uint32_t ecc_strength)
+static inline uint32_t mxs_nand_ecc_size_in_bits(uint32_t ecc_strength)
 {
 	return ecc_strength * 13;
 }
 
-static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
+static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
 						uint32_t page_oob_size)
 {
 	if (page_data_size == 2048)
@@ -163,7 +163,7 @@ static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
 	return 0;
 }
 
-static inline uint32_t mx28_nand_get_mark_offset(uint32_t page_data_size,
+static inline uint32_t mxs_nand_get_mark_offset(uint32_t page_data_size,
 						uint32_t ecc_strength)
 {
 	uint32_t chunk_data_size_in_bits;
@@ -174,7 +174,7 @@ static inline uint32_t mx28_nand_get_mark_offset(uint32_t page_data_size,
 	uint32_t block_mark_bit_offset;
 
 	chunk_data_size_in_bits = MXS_NAND_CHUNK_DATA_CHUNK_SIZE * 8;
-	chunk_ecc_size_in_bits  = mx28_nand_ecc_size_in_bits(ecc_strength);
+	chunk_ecc_size_in_bits  = mxs_nand_ecc_size_in_bits(ecc_strength);
 
 	chunk_total_size_in_bits =
 			chunk_data_size_in_bits + chunk_ecc_size_in_bits;
@@ -212,21 +212,21 @@ static inline uint32_t mx28_nand_get_mark_offset(uint32_t page_data_size,
 	return block_mark_bit_offset;
 }
 
-static inline uint32_t mx28_nand_mark_byte_offset(void)
+static inline uint32_t mxs_nand_mark_byte_offset(void)
 {
 	uint32_t ecc_strength;
-	ecc_strength = mx28_nand_get_ecc_strength(nand_writesize, nand_oobsize);
-	return mx28_nand_get_mark_offset(nand_writesize, ecc_strength) >> 3;
+	ecc_strength = mxs_nand_get_ecc_strength(nand_writesize, nand_oobsize);
+	return mxs_nand_get_mark_offset(nand_writesize, ecc_strength) >> 3;
 }
 
-static inline uint32_t mx28_nand_mark_bit_offset(void)
+static inline uint32_t mxs_nand_mark_bit_offset(void)
 {
 	uint32_t ecc_strength;
-	ecc_strength = mx28_nand_get_ecc_strength(nand_writesize, nand_oobsize);
-	return mx28_nand_get_mark_offset(nand_writesize, ecc_strength) & 0x7;
+	ecc_strength = mxs_nand_get_ecc_strength(nand_writesize, nand_oobsize);
+	return mxs_nand_get_mark_offset(nand_writesize, ecc_strength) & 0x7;
 }
 
-static uint32_t mx28_nand_block_csum(uint8_t *block, uint32_t size)
+static uint32_t mxs_nand_block_csum(uint8_t *block, uint32_t size)
 {
 	uint32_t csum = 0;
 	int i;
@@ -237,9 +237,9 @@ static uint32_t mx28_nand_block_csum(uint8_t *block, uint32_t size)
 	return csum ^ 0xffffffff;
 }
 
-static struct mx28_nand_fcb *mx28_nand_get_fcb(uint32_t size)
+static struct mxs_nand_fcb *mxs_nand_get_fcb(uint32_t size)
 {
-	struct mx28_nand_fcb *fcb;
+	struct mxs_nand_fcb *fcb;
 	uint32_t bcb_size_bytes;
 	uint32_t stride_size_bytes;
 	uint32_t bootstream_size_pages;
@@ -248,7 +248,7 @@ static struct mx28_nand_fcb *mx28_nand_get_fcb(uint32_t size)
 
 	fcb = malloc(nand_writesize);
 	if (!fcb) {
-		printf("MX28 NAND: Unable to allocate FCB\n");
+		printf("MXS NAND: Unable to allocate FCB\n");
 		return NULL;
 	}
 
@@ -289,15 +289,15 @@ static struct mx28_nand_fcb *mx28_nand_get_fcb(uint32_t size)
 	}
 
 	if (fcb->ecc_block_n_ecc_type == 0) {
-		printf("MX28 NAND: Unsupported NAND geometry\n");
+		printf("MXS NAND: Unsupported NAND geometry\n");
 		goto err;
 	}
 
 	fcb->boot_patch =			0;
 	fcb->patch_sectors =			0;
 
-	fcb->badblock_marker_byte =	mx28_nand_mark_byte_offset();
-	fcb->badblock_marker_start_bit = mx28_nand_mark_bit_offset();
+	fcb->badblock_marker_byte =	mxs_nand_mark_byte_offset();
+	fcb->badblock_marker_start_bit = mxs_nand_mark_bit_offset();
 	fcb->bb_marker_physical_offset = nand_writesize;
 
 	stride_size_bytes = STRIDE_PAGES * nand_writesize;
@@ -324,13 +324,13 @@ err:
 	return NULL;
 }
 
-static struct mx28_nand_dbbt *mx28_nand_get_dbbt(void)
+static struct mxs_nand_dbbt *mxs_nand_get_dbbt(void)
 {
-	struct mx28_nand_dbbt *dbbt;
+	struct mxs_nand_dbbt *dbbt;
 
 	dbbt = malloc(nand_writesize);
 	if (!dbbt) {
-		printf("MX28 NAND: Unable to allocate DBBT\n");
+		printf("MXS NAND: Unable to allocate DBBT\n");
 		return NULL;
 	}
 
@@ -342,7 +342,7 @@ static struct mx28_nand_dbbt *mx28_nand_get_dbbt(void)
 	return dbbt;
 }
 
-static inline uint8_t mx28_nand_parity_13_8(const uint8_t b)
+static inline uint8_t mxs_nand_parity_13_8(const uint8_t b)
 {
 	uint32_t parity = 0, tmp;
 
@@ -365,7 +365,7 @@ static inline uint8_t mx28_nand_parity_13_8(const uint8_t b)
 	return parity;
 }
 
-static uint8_t *mx28_nand_fcb_block(struct mx28_nand_fcb *fcb)
+static uint8_t *mxs_nand_fcb_block(struct mxs_nand_fcb *fcb)
 {
 	uint8_t *block;
 	uint8_t *ecc;
@@ -373,36 +373,36 @@ static uint8_t *mx28_nand_fcb_block(struct mx28_nand_fcb *fcb)
 
 	block = malloc(nand_writesize + nand_oobsize);
 	if (!block) {
-		printf("MX28 NAND: Unable to allocate FCB block\n");
+		printf("MXS NAND: Unable to allocate FCB block\n");
 		return NULL;
 	}
 
 	memset(block, 0, nand_writesize + nand_oobsize);
 
 	/* Update the FCB checksum */
-	fcb->checksum = mx28_nand_block_csum(((uint8_t *)fcb) + 4, 508);
+	fcb->checksum = mxs_nand_block_csum(((uint8_t *)fcb) + 4, 508);
 
-	/* Figure 12-11. in iMX28RM, rev. 1, says FCB is at offset 12 */
-	memcpy(block + 12, fcb, sizeof(struct mx28_nand_fcb));
+	/* Figure 12-11. in iMXSRM, rev. 1, says FCB is at offset 12 */
+	memcpy(block + 12, fcb, sizeof(struct mxs_nand_fcb));
 
 	/* ECC is at offset 12 + 512 */
 	ecc = block + 12 + 512;
 
 	/* Compute the ECC parity */
-	for (i = 0; i < sizeof(struct mx28_nand_fcb); i++)
-		ecc[i] = mx28_nand_parity_13_8(block[i + 12]);
+	for (i = 0; i < sizeof(struct mxs_nand_fcb); i++)
+		ecc[i] = mxs_nand_parity_13_8(block[i + 12]);
 
 	return block;
 }
 
-static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
+static int mxs_nand_write_fcb(struct mxs_nand_fcb *fcb, char *buf)
 {
 	uint32_t offset;
 	uint8_t *fcbblock;
 	int ret = 0;
 	int i;
 
-	fcbblock = mx28_nand_fcb_block(fcb);
+	fcbblock = mxs_nand_fcb_block(fcb);
 	if (!fcbblock)
 		return -1;
 
@@ -415,20 +415,20 @@ static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
 	return ret;
 }
 
-static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, char *buf)
+static int mxs_nand_write_dbbt(struct mxs_nand_dbbt *dbbt, char *buf)
 {
 	uint32_t offset;
 	int i = STRIDE_PAGES * STRIDE_COUNT;
 
 	for (; i < 2 * STRIDE_PAGES * STRIDE_COUNT; i += STRIDE_PAGES) {
 		offset = i * nand_writesize;
-		memcpy(buf + offset, dbbt, sizeof(struct mx28_nand_dbbt));
+		memcpy(buf + offset, dbbt, sizeof(struct mxs_nand_dbbt));
 	}
 
 	return 0;
 }
 
-static int mx28_nand_write_firmware(struct mx28_nand_fcb *fcb, int infd,
+static int mxs_nand_write_firmware(struct mxs_nand_fcb *fcb, int infd,
 					char *buf)
 {
 	int ret;
@@ -454,7 +454,7 @@ void usage(void)
 {
 	printf(
 		"Usage: mxsboot [ops] <type> <infile> <outfile>\n"
-		"Augment BootStream file with a proper header for i.MX28 boot\n"
+		"Augment BootStream file with a proper header for i.MXS boot\n"
 		"\n"
 		"  <type>	type of image:\n"
 		"                 \"nand\" for NAND image\n"
@@ -473,10 +473,10 @@ void usage(void)
 	);
 }
 
-static int mx28_create_nand_image(int infd, int outfd)
+static int mxs_create_nand_image(int infd, int outfd)
 {
-	struct mx28_nand_fcb *fcb;
-	struct mx28_nand_dbbt *dbbt;
+	struct mxs_nand_fcb *fcb;
+	struct mxs_nand_dbbt *dbbt;
 	int ret = -1;
 	char *buf;
 	int size;
@@ -492,31 +492,31 @@ static int mx28_create_nand_image(int infd, int outfd)
 
 	memset(buf, 0, size);
 
-	fcb = mx28_nand_get_fcb(MAX_BOOTSTREAM_SIZE);
+	fcb = mxs_nand_get_fcb(MAX_BOOTSTREAM_SIZE);
 	if (!fcb) {
 		printf("Unable to compile FCB\n");
 		goto err1;
 	}
 
-	dbbt = mx28_nand_get_dbbt();
+	dbbt = mxs_nand_get_dbbt();
 	if (!dbbt) {
 		printf("Unable to compile DBBT\n");
 		goto err2;
 	}
 
-	ret = mx28_nand_write_fcb(fcb, buf);
+	ret = mxs_nand_write_fcb(fcb, buf);
 	if (ret) {
 		printf("Unable to write FCB to buffer\n");
 		goto err3;
 	}
 
-	ret = mx28_nand_write_dbbt(dbbt, buf);
+	ret = mxs_nand_write_dbbt(dbbt, buf);
 	if (ret) {
 		printf("Unable to write DBBT to buffer\n");
 		goto err3;
 	}
 
-	ret = mx28_nand_write_firmware(fcb, infd, buf);
+	ret = mxs_nand_write_firmware(fcb, infd, buf);
 	if (ret) {
 		printf("Unable to write firmware to buffer\n");
 		goto err3;
@@ -540,14 +540,14 @@ err0:
 	return ret;
 }
 
-static int mx28_create_sd_image(int infd, int outfd)
+static int mxs_create_sd_image(int infd, int outfd)
 {
 	int ret = -1;
 	uint32_t *buf;
 	int size;
 	off_t fsize;
 	ssize_t wr_size;
-	struct mx28_sd_config_block *cb;
+	struct mxs_sd_config_block *cb;
 
 	fsize = lseek(infd, 0, SEEK_END);
 	lseek(infd, 0, SEEK_SET);
@@ -565,7 +565,7 @@ static int mx28_create_sd_image(int infd, int outfd)
 		goto err1;
 	}
 
-	cb = (struct mx28_sd_config_block *)buf;
+	cb = (struct mxs_sd_config_block *)buf;
 
 	cb->signature = 0x00112233;
 	cb->primary_boot_tag = 0x1;
@@ -675,9 +675,9 @@ int main(int argc, char **argv)
 	}
 
 	if (!strcmp(argv[offset], "sd"))
-		ret = mx28_create_sd_image(infd, outfd);
+		ret = mxs_create_sd_image(infd, outfd);
 	else if (!strcmp(argv[offset], "nand"))
-		ret = mx28_create_nand_image(infd, outfd);
+		ret = mxs_create_nand_image(infd, outfd);
 
 	close(outfd);
 err2:
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (3 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 17:12   ` Marek Vasut
  2012-06-13  9:07   ` Stefano Babic
  2012-05-12 23:40 ` [U-Boot] [PATCH 6/8] mx28evk: " Otavio Salvador
                   ` (3 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/m28evk.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index ebf7e39..c1ae996 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
-#ifndef __M28_H__
-#define __M28_H__
+#ifndef __M28EVK_CONFIG_H__
+#define __M28EVK_CONFIG_H__
 
 #include <asm/arch/regs-base.h>
 
@@ -327,4 +327,4 @@
 		"fi ; "							\
 		"fi\0"
 
-#endif /* __M28_H__ */
+#endif /* __M28EVK_CONFIG_H__ */
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 6/8] mx28evk: fix board config include guardian macro name
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (4 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 19:31   ` Fabio Estevam
  2012-06-13  9:06   ` Stefano Babic
  2012-05-12 23:40 ` [U-Boot] [PATCH 7/8] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs Otavio Salvador
                   ` (2 subsequent siblings)
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/mx28evk.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 5ccfe70..e98a746 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -16,8 +16,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  */
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __MX28EVK_CONFIG_H__
+#define __MX28EVK_CONFIG_H__
 
 #include <asm/arch/regs-base.h>
 
@@ -252,4 +252,4 @@
 		"run netargs; " \
 		"dhcp ${uimage}; bootm\0" \
 
-#endif /* __CONFIG_H */
+#endif /* __MX28EVK_CONFIG_H__ */
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 7/8] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (5 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 6/8] mx28evk: " Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-12 23:40 ` [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix Otavio Salvador
  2012-05-29 20:47 ` [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Wolfgang Denk
  8 siblings, 0 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

Most code can be shared between i.MX23 and i.MX28 as both are from
i.MXS family; this source directory structure makes easy to share code
among them.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile               |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c                |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c                |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c                 |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h            |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c             |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c       |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c         |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c       |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S                |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c                |    0
 arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds         |    2 +-
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h        |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h          |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h         |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h   |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h        |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h    |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h    |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h  |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h  |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h    |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h   |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h   |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h   |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h   |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h  |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h     |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h  |    0
 arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h    |    0
 boards.cfg                                                  |    4 ++--
 doc/README.m28                                              |    4 ++--
 doc/README.mx28evk                                          |    4 ++--
 include/configs/m28evk.h                                    |    4 ++--
 include/configs/mx28evk.h                                   |    4 ++--
 42 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/mx28_init.h (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (100%)
 rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux-mx28.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/iomux.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-apbh.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-base.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-bch.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lcdif.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-lradc.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-power.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-timrot.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h (100%)
 rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h (100%)

diff --git a/arch/arm/cpu/arm926ejs/mx28/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/Makefile
rename to arch/arm/cpu/arm926ejs/mxs/Makefile
diff --git a/arch/arm/cpu/arm926ejs/mx28/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/clock.c
rename to arch/arm/cpu/arm926ejs/mxs/clock.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/iomux.c
rename to arch/arm/cpu/arm926ejs/mxs/iomux.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mxs/mx28.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/mx28.c
rename to arch/arm/cpu/arm926ejs/mxs/mx28.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28_init.h b/arch/arm/cpu/arm926ejs/mxs/mx28_init.h
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/mx28_init.h
rename to arch/arm/cpu/arm926ejs/mxs/mx28_init.h
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_boot.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_boot.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_lradc_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/spl_power_init.c
rename to arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/start.S
rename to arch/arm/cpu/arm926ejs/mxs/start.S
diff --git a/arch/arm/cpu/arm926ejs/mx28/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/mx28/timer.c
rename to arch/arm/cpu/arm926ejs/mxs/timer.c
diff --git a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
similarity index 97%
rename from arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds
rename to arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
index 0fccd52..f8ea38c 100644
--- a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
@@ -37,7 +37,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text	:
 	{
-		arch/arm/cpu/arm926ejs/mx28/start.o	(.text)
+		arch/arm/cpu/arm926ejs/mxs/start.o	(.text)
 		*(.text)
 	}
 
diff --git a/arch/arm/include/asm/arch-mx28/clock.h b/arch/arm/include/asm/arch-mxs/clock.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/clock.h
rename to arch/arm/include/asm/arch-mxs/clock.h
diff --git a/arch/arm/include/asm/arch-mx28/dma.h b/arch/arm/include/asm/arch-mxs/dma.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/dma.h
rename to arch/arm/include/asm/arch-mxs/dma.h
diff --git a/arch/arm/include/asm/arch-mx28/gpio.h b/arch/arm/include/asm/arch-mxs/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/gpio.h
rename to arch/arm/include/asm/arch-mxs/gpio.h
diff --git a/arch/arm/include/asm/arch-mx28/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/imx-regs.h
rename to arch/arm/include/asm/arch-mxs/imx-regs.h
diff --git a/arch/arm/include/asm/arch-mx28/iomux-mx28.h b/arch/arm/include/asm/arch-mxs/iomux-mx28.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/iomux-mx28.h
rename to arch/arm/include/asm/arch-mxs/iomux-mx28.h
diff --git a/arch/arm/include/asm/arch-mx28/iomux.h b/arch/arm/include/asm/arch-mxs/iomux.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/iomux.h
rename to arch/arm/include/asm/arch-mxs/iomux.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-apbh.h b/arch/arm/include/asm/arch-mxs/regs-apbh.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-apbh.h
rename to arch/arm/include/asm/arch-mxs/regs-apbh.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-base.h b/arch/arm/include/asm/arch-mxs/regs-base.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-base.h
rename to arch/arm/include/asm/arch-mxs/regs-base.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-bch.h b/arch/arm/include/asm/arch-mxs/regs-bch.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-bch.h
rename to arch/arm/include/asm/arch-mxs/regs-bch.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-clkctrl.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-clkctrl.h
rename to arch/arm/include/asm/arch-mxs/regs-clkctrl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-common.h b/arch/arm/include/asm/arch-mxs/regs-common.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-common.h
rename to arch/arm/include/asm/arch-mxs/regs-common.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-digctl.h
rename to arch/arm/include/asm/arch-mxs/regs-digctl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-gpmi.h b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-gpmi.h
rename to arch/arm/include/asm/arch-mxs/regs-gpmi.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-i2c.h
rename to arch/arm/include/asm/arch-mxs/regs-i2c.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-lcdif.h b/arch/arm/include/asm/arch-mxs/regs-lcdif.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-lcdif.h
rename to arch/arm/include/asm/arch-mxs/regs-lcdif.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-lradc.h b/arch/arm/include/asm/arch-mxs/regs-lradc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-lradc.h
rename to arch/arm/include/asm/arch-mxs/regs-lradc.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-ocotp.h
rename to arch/arm/include/asm/arch-mxs/regs-ocotp.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-pinctrl.h
rename to arch/arm/include/asm/arch-mxs/regs-pinctrl.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-power.h b/arch/arm/include/asm/arch-mxs/regs-power.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-power.h
rename to arch/arm/include/asm/arch-mxs/regs-power.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-rtc.h b/arch/arm/include/asm/arch-mxs/regs-rtc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-rtc.h
rename to arch/arm/include/asm/arch-mxs/regs-rtc.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-ssp.h
rename to arch/arm/include/asm/arch-mxs/regs-ssp.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-timrot.h
rename to arch/arm/include/asm/arch-mxs/regs-timrot.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-usb.h b/arch/arm/include/asm/arch-mxs/regs-usb.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-usb.h
rename to arch/arm/include/asm/arch-mxs/regs-usb.h
diff --git a/arch/arm/include/asm/arch-mx28/regs-usbphy.h b/arch/arm/include/asm/arch-mxs/regs-usbphy.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/regs-usbphy.h
rename to arch/arm/include/asm/arch-mxs/regs-usbphy.h
diff --git a/arch/arm/include/asm/arch-mx28/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx28/sys_proto.h
rename to arch/arm/include/asm/arch-mxs/sys_proto.h
diff --git a/boards.cfg b/boards.cfg
index 6c24697..e7b7081 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -163,8 +163,8 @@ tx25                         arm         arm926ejs   tx25                karo
 zmx25                        arm         arm926ejs   zmx25               syteco         mx25
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
-m28evk                       arm         arm926ejs   -                   denx           mx28
-mx28evk                      arm         arm926ejs   -                   freescale      mx28
+m28evk                       arm         arm926ejs   m28evk              denx           mxs		m28evk
+mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs		mx28evk
 nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 omap5912osk                  arm         arm926ejs   -                   ti             omap
diff --git a/doc/README.m28 b/doc/README.m28
index 7dee8ce..2a92226 100644
--- a/doc/README.m28
+++ b/doc/README.m28
@@ -4,8 +4,8 @@ DENX M28EVK
 Files of the M28/M28EVK port
 ----------------------------
 
-arch/arm/cpu/arm926ejs/mx28/	- The CPU support code for the Freescale i.MX28
-arch/arm/include/asm/arch-mx28/	- Header files for the Freescale i.MX28
+arch/arm/cpu/arm926ejs/mxs/	- The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/	- Header files for the Freescale i.MX28
 board/denx/m28evk/		- M28EVK board specific files
 include/configs/m28evk.h	- M28EVK configuration file
 
diff --git a/doc/README.mx28evk b/doc/README.mx28evk
index c6c3d37..ca5f931 100644
--- a/doc/README.mx28evk
+++ b/doc/README.mx28evk
@@ -6,8 +6,8 @@ Supported hardware: only MX28EVK rev D is supported in U-boot.
 Files of the MX28EVK port
 --------------------------
 
-arch/arm/cpu/arm926ejs/mx28/	- The CPU support code for the Freescale i.MX28
-arch/arm/include/asm/arch-mx28/	- Header files for the Freescale i.MX28
+arch/arm/cpu/arm926ejs/mxs/	- The CPU support code for the Freescale i.MX28
+arch/arm/include/asm/arch-mxs/	- Header files for the Freescale i.MX28
 board/freescale/mx28evk/	- MX28EVK board specific files
 include/configs/mx28evk.h	- MX28EVK configuration file
 
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c1ae996..3835865 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -50,8 +50,8 @@
  */
 #define	CONFIG_SPL
 #define	CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define	CONFIG_SPL_START_S_PATH		"arch/arm/cpu/arm926ejs/mx28"
-#define	CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define	CONFIG_SPL_START_S_PATH		"arch/arm/cpu/arm926ejs/mxs"
+#define	CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define	CONFIG_SPL_LIBCOMMON_SUPPORT
 #define	CONFIG_SPL_LIBGENERIC_SUPPORT
 #define	CONFIG_SPL_GPIO_SUPPORT
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index e98a746..80d7ce2 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -42,8 +42,8 @@
  */
 #define CONFIG_SPL
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH	"arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define CONFIG_SPL_START_S_PATH	"arch/arm/cpu/arm926ejs/mxs"
+#define CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (6 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 7/8] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs Otavio Salvador
@ 2012-05-12 23:40 ` Otavio Salvador
  2012-05-13 17:15   ` Marek Vasut
  2012-05-14 18:48   ` Otavio Salvador
  2012-05-29 20:47 ` [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Wolfgang Denk
  8 siblings, 2 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-12 23:40 UTC (permalink / raw)
  To: u-boot

As the register accessing mode is the same for all i.MXS SoCs we ought
to use 'mxs' prefix intead of 'mx28'.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 arch/arm/cpu/arm926ejs/mxs/clock.c           |    4 +-
 arch/arm/cpu/arm926ejs/mxs/iomux.c           |    6 +-
 arch/arm/cpu/arm926ejs/mxs/mx28.c            |    6 +-
 arch/arm/include/asm/arch-mxs/regs-apbh.h    |  254 +++++++++++++-------------
 arch/arm/include/asm/arch-mxs/regs-bch.h     |   42 ++---
 arch/arm/include/asm/arch-mxs/regs-clkctrl.h |   58 +++---
 arch/arm/include/asm/arch-mxs/regs-common.h  |   34 ++--
 arch/arm/include/asm/arch-mxs/regs-digctl.h  |   50 ++---
 arch/arm/include/asm/arch-mxs/regs-gpmi.h    |   26 +--
 arch/arm/include/asm/arch-mxs/regs-i2c.h     |   28 +--
 arch/arm/include/asm/arch-mxs/regs-lcdif.h   |   64 +++----
 arch/arm/include/asm/arch-mxs/regs-lradc.h   |   48 ++---
 arch/arm/include/asm/arch-mxs/regs-ocotp.h   |   86 ++++-----
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h |  168 ++++++++---------
 arch/arm/include/asm/arch-mxs/regs-power.h   |   28 +--
 arch/arm/include/asm/arch-mxs/regs-rtc.h     |   28 +--
 arch/arm/include/asm/arch-mxs/regs-ssp.h     |   40 ++--
 arch/arm/include/asm/arch-mxs/regs-timrot.h  |   38 ++--
 arch/arm/include/asm/arch-mxs/regs-usbphy.h  |   20 +-
 arch/arm/include/asm/arch-mxs/sys_proto.h    |    6 +-
 drivers/gpio/mxs_gpio.c                      |   16 +-
 drivers/usb/host/ehci-mxs.c                  |    8 +-
 22 files changed, 529 insertions(+), 529 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 0439f9c..3e29c56 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -207,7 +207,7 @@ void mx28_set_sspclk(enum mxs_sspclock ssp, uint32_t freq, int xtal)
 		return;
 
 	clkreg = (uint32_t)(&clkctrl_regs->hw_clkctrl_ssp0) +
-			(ssp * sizeof(struct mx28_register_32));
+			(ssp * sizeof(struct mxs_register_32));
 
 	clrbits_le32(clkreg, CLKCTRL_SSP_CLKGATE);
 	while (readl(clkreg) & CLKCTRL_SSP_CLKGATE)
@@ -256,7 +256,7 @@ static uint32_t mx28_get_sspclk(enum mxs_sspclock ssp)
 		return XTAL_FREQ_KHZ;
 
 	clkreg = (uint32_t)(&clkctrl_regs->hw_clkctrl_ssp0) +
-			(ssp * sizeof(struct mx28_register_32));
+			(ssp * sizeof(struct mxs_register_32));
 
 	tmp = readl(clkreg) & CLKCTRL_SSP_DIV_MASK;
 
diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
index 12916b6..73f1446 100644
--- a/arch/arm/cpu/arm926ejs/mxs/iomux.c
+++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -43,7 +43,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
 {
 	u32 reg, ofs, bp, bm;
 	void *iomux_base = (void *)MXS_PINCTRL_BASE;
-	struct mx28_register_32 *mxs_reg;
+	struct mxs_register_32 *mxs_reg;
 
 	/* muxsel */
 	ofs = 0x100;
@@ -70,7 +70,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
 	/* vol */
 	if (PAD_VOL_VALID(pad)) {
 		bp = PAD_PIN(pad) % 8 * 4 + 2;
-		mxs_reg = (struct mx28_register_32 *)(iomux_base + ofs);
+		mxs_reg = (struct mxs_register_32 *)(iomux_base + ofs);
 		if (PAD_VOL(pad))
 			writel(1 << bp, &mxs_reg->reg_set);
 		else
@@ -82,7 +82,7 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad)
 		ofs = PULL_OFFSET;
 		ofs += PAD_BANK(pad) * 0x10;
 		bp = PAD_PIN(pad);
-		mxs_reg = (struct mx28_register_32 *)(iomux_base + ofs);
+		mxs_reg = (struct mxs_register_32 *)(iomux_base + ofs);
 		if (PAD_PULL(pad))
 			writel(1 << bp, &mxs_reg->reg_set);
 		else
diff --git a/arch/arm/cpu/arm926ejs/mxs/mx28.c b/arch/arm/cpu/arm926ejs/mxs/mx28.c
index a82ff25..a0ec06e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mx28.c
@@ -81,7 +81,7 @@ void enable_caches(void)
 #endif
 }
 
-int mx28_wait_mask_set(struct mx28_register_32 *reg, uint32_t mask, int timeout)
+int mx28_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 mx28_register_32 *reg, uint32_t mask, int timeout)
 	return !timeout;
 }
 
-int mx28_wait_mask_clr(struct mx28_register_32 *reg, uint32_t mask, int timeout)
+int mx28_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, int timeout)
 {
 	while (--timeout) {
 		if ((readl(&reg->reg) & mask) == 0)
@@ -103,7 +103,7 @@ int mx28_wait_mask_clr(struct mx28_register_32 *reg, uint32_t mask, int timeout)
 	return !timeout;
 }
 
-int mx28_reset_block(struct mx28_register_32 *reg)
+int mx28_reset_block(struct mxs_register_32 *reg)
 {
 	/* Clear SFTRST */
 	writel(MX28_BLOCK_SFTRST, &reg->reg_clr);
diff --git a/arch/arm/include/asm/arch-mxs/regs-apbh.h b/arch/arm/include/asm/arch-mxs/regs-apbh.h
index 91d7bc8..7c6bd04 100644
--- a/arch/arm/include/asm/arch-mxs/regs-apbh.h
+++ b/arch/arm/include/asm/arch-mxs/regs-apbh.h
@@ -30,142 +30,142 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_apbh_regs {
-	mx28_reg_32(hw_apbh_ctrl0)
-	mx28_reg_32(hw_apbh_ctrl1)
-	mx28_reg_32(hw_apbh_ctrl2)
-	mx28_reg_32(hw_apbh_channel_ctrl)
-	mx28_reg_32(hw_apbh_devsel)
-	mx28_reg_32(hw_apbh_dma_burst_size)
-	mx28_reg_32(hw_apbh_debug)
+	mxs_reg_32(hw_apbh_ctrl0)
+	mxs_reg_32(hw_apbh_ctrl1)
+	mxs_reg_32(hw_apbh_ctrl2)
+	mxs_reg_32(hw_apbh_channel_ctrl)
+	mxs_reg_32(hw_apbh_devsel)
+	mxs_reg_32(hw_apbh_dma_burst_size)
+	mxs_reg_32(hw_apbh_debug)
 
 	uint32_t	reserved[36];
 
 	union {
 	struct {
-		mx28_reg_32(hw_apbh_ch_curcmdar)
-		mx28_reg_32(hw_apbh_ch_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch_cmd)
-		mx28_reg_32(hw_apbh_ch_bar)
-		mx28_reg_32(hw_apbh_ch_sema)
-		mx28_reg_32(hw_apbh_ch_debug1)
-		mx28_reg_32(hw_apbh_ch_debug2)
+		mxs_reg_32(hw_apbh_ch_curcmdar)
+		mxs_reg_32(hw_apbh_ch_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch_cmd)
+		mxs_reg_32(hw_apbh_ch_bar)
+		mxs_reg_32(hw_apbh_ch_sema)
+		mxs_reg_32(hw_apbh_ch_debug1)
+		mxs_reg_32(hw_apbh_ch_debug2)
 	} ch[16];
 	struct {
-		mx28_reg_32(hw_apbh_ch0_curcmdar)
-		mx28_reg_32(hw_apbh_ch0_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch0_cmd)
-		mx28_reg_32(hw_apbh_ch0_bar)
-		mx28_reg_32(hw_apbh_ch0_sema)
-		mx28_reg_32(hw_apbh_ch0_debug1)
-		mx28_reg_32(hw_apbh_ch0_debug2)
-		mx28_reg_32(hw_apbh_ch1_curcmdar)
-		mx28_reg_32(hw_apbh_ch1_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch1_cmd)
-		mx28_reg_32(hw_apbh_ch1_bar)
-		mx28_reg_32(hw_apbh_ch1_sema)
-		mx28_reg_32(hw_apbh_ch1_debug1)
-		mx28_reg_32(hw_apbh_ch1_debug2)
-		mx28_reg_32(hw_apbh_ch2_curcmdar)
-		mx28_reg_32(hw_apbh_ch2_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch2_cmd)
-		mx28_reg_32(hw_apbh_ch2_bar)
-		mx28_reg_32(hw_apbh_ch2_sema)
-		mx28_reg_32(hw_apbh_ch2_debug1)
-		mx28_reg_32(hw_apbh_ch2_debug2)
-		mx28_reg_32(hw_apbh_ch3_curcmdar)
-		mx28_reg_32(hw_apbh_ch3_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch3_cmd)
-		mx28_reg_32(hw_apbh_ch3_bar)
-		mx28_reg_32(hw_apbh_ch3_sema)
-		mx28_reg_32(hw_apbh_ch3_debug1)
-		mx28_reg_32(hw_apbh_ch3_debug2)
-		mx28_reg_32(hw_apbh_ch4_curcmdar)
-		mx28_reg_32(hw_apbh_ch4_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch4_cmd)
-		mx28_reg_32(hw_apbh_ch4_bar)
-		mx28_reg_32(hw_apbh_ch4_sema)
-		mx28_reg_32(hw_apbh_ch4_debug1)
-		mx28_reg_32(hw_apbh_ch4_debug2)
-		mx28_reg_32(hw_apbh_ch5_curcmdar)
-		mx28_reg_32(hw_apbh_ch5_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch5_cmd)
-		mx28_reg_32(hw_apbh_ch5_bar)
-		mx28_reg_32(hw_apbh_ch5_sema)
-		mx28_reg_32(hw_apbh_ch5_debug1)
-		mx28_reg_32(hw_apbh_ch5_debug2)
-		mx28_reg_32(hw_apbh_ch6_curcmdar)
-		mx28_reg_32(hw_apbh_ch6_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch6_cmd)
-		mx28_reg_32(hw_apbh_ch6_bar)
-		mx28_reg_32(hw_apbh_ch6_sema)
-		mx28_reg_32(hw_apbh_ch6_debug1)
-		mx28_reg_32(hw_apbh_ch6_debug2)
-		mx28_reg_32(hw_apbh_ch7_curcmdar)
-		mx28_reg_32(hw_apbh_ch7_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch7_cmd)
-		mx28_reg_32(hw_apbh_ch7_bar)
-		mx28_reg_32(hw_apbh_ch7_sema)
-		mx28_reg_32(hw_apbh_ch7_debug1)
-		mx28_reg_32(hw_apbh_ch7_debug2)
-		mx28_reg_32(hw_apbh_ch8_curcmdar)
-		mx28_reg_32(hw_apbh_ch8_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch8_cmd)
-		mx28_reg_32(hw_apbh_ch8_bar)
-		mx28_reg_32(hw_apbh_ch8_sema)
-		mx28_reg_32(hw_apbh_ch8_debug1)
-		mx28_reg_32(hw_apbh_ch8_debug2)
-		mx28_reg_32(hw_apbh_ch9_curcmdar)
-		mx28_reg_32(hw_apbh_ch9_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch9_cmd)
-		mx28_reg_32(hw_apbh_ch9_bar)
-		mx28_reg_32(hw_apbh_ch9_sema)
-		mx28_reg_32(hw_apbh_ch9_debug1)
-		mx28_reg_32(hw_apbh_ch9_debug2)
-		mx28_reg_32(hw_apbh_ch10_curcmdar)
-		mx28_reg_32(hw_apbh_ch10_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch10_cmd)
-		mx28_reg_32(hw_apbh_ch10_bar)
-		mx28_reg_32(hw_apbh_ch10_sema)
-		mx28_reg_32(hw_apbh_ch10_debug1)
-		mx28_reg_32(hw_apbh_ch10_debug2)
-		mx28_reg_32(hw_apbh_ch11_curcmdar)
-		mx28_reg_32(hw_apbh_ch11_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch11_cmd)
-		mx28_reg_32(hw_apbh_ch11_bar)
-		mx28_reg_32(hw_apbh_ch11_sema)
-		mx28_reg_32(hw_apbh_ch11_debug1)
-		mx28_reg_32(hw_apbh_ch11_debug2)
-		mx28_reg_32(hw_apbh_ch12_curcmdar)
-		mx28_reg_32(hw_apbh_ch12_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch12_cmd)
-		mx28_reg_32(hw_apbh_ch12_bar)
-		mx28_reg_32(hw_apbh_ch12_sema)
-		mx28_reg_32(hw_apbh_ch12_debug1)
-		mx28_reg_32(hw_apbh_ch12_debug2)
-		mx28_reg_32(hw_apbh_ch13_curcmdar)
-		mx28_reg_32(hw_apbh_ch13_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch13_cmd)
-		mx28_reg_32(hw_apbh_ch13_bar)
-		mx28_reg_32(hw_apbh_ch13_sema)
-		mx28_reg_32(hw_apbh_ch13_debug1)
-		mx28_reg_32(hw_apbh_ch13_debug2)
-		mx28_reg_32(hw_apbh_ch14_curcmdar)
-		mx28_reg_32(hw_apbh_ch14_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch14_cmd)
-		mx28_reg_32(hw_apbh_ch14_bar)
-		mx28_reg_32(hw_apbh_ch14_sema)
-		mx28_reg_32(hw_apbh_ch14_debug1)
-		mx28_reg_32(hw_apbh_ch14_debug2)
-		mx28_reg_32(hw_apbh_ch15_curcmdar)
-		mx28_reg_32(hw_apbh_ch15_nxtcmdar)
-		mx28_reg_32(hw_apbh_ch15_cmd)
-		mx28_reg_32(hw_apbh_ch15_bar)
-		mx28_reg_32(hw_apbh_ch15_sema)
-		mx28_reg_32(hw_apbh_ch15_debug1)
-		mx28_reg_32(hw_apbh_ch15_debug2)
+		mxs_reg_32(hw_apbh_ch0_curcmdar)
+		mxs_reg_32(hw_apbh_ch0_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch0_cmd)
+		mxs_reg_32(hw_apbh_ch0_bar)
+		mxs_reg_32(hw_apbh_ch0_sema)
+		mxs_reg_32(hw_apbh_ch0_debug1)
+		mxs_reg_32(hw_apbh_ch0_debug2)
+		mxs_reg_32(hw_apbh_ch1_curcmdar)
+		mxs_reg_32(hw_apbh_ch1_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch1_cmd)
+		mxs_reg_32(hw_apbh_ch1_bar)
+		mxs_reg_32(hw_apbh_ch1_sema)
+		mxs_reg_32(hw_apbh_ch1_debug1)
+		mxs_reg_32(hw_apbh_ch1_debug2)
+		mxs_reg_32(hw_apbh_ch2_curcmdar)
+		mxs_reg_32(hw_apbh_ch2_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch2_cmd)
+		mxs_reg_32(hw_apbh_ch2_bar)
+		mxs_reg_32(hw_apbh_ch2_sema)
+		mxs_reg_32(hw_apbh_ch2_debug1)
+		mxs_reg_32(hw_apbh_ch2_debug2)
+		mxs_reg_32(hw_apbh_ch3_curcmdar)
+		mxs_reg_32(hw_apbh_ch3_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch3_cmd)
+		mxs_reg_32(hw_apbh_ch3_bar)
+		mxs_reg_32(hw_apbh_ch3_sema)
+		mxs_reg_32(hw_apbh_ch3_debug1)
+		mxs_reg_32(hw_apbh_ch3_debug2)
+		mxs_reg_32(hw_apbh_ch4_curcmdar)
+		mxs_reg_32(hw_apbh_ch4_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch4_cmd)
+		mxs_reg_32(hw_apbh_ch4_bar)
+		mxs_reg_32(hw_apbh_ch4_sema)
+		mxs_reg_32(hw_apbh_ch4_debug1)
+		mxs_reg_32(hw_apbh_ch4_debug2)
+		mxs_reg_32(hw_apbh_ch5_curcmdar)
+		mxs_reg_32(hw_apbh_ch5_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch5_cmd)
+		mxs_reg_32(hw_apbh_ch5_bar)
+		mxs_reg_32(hw_apbh_ch5_sema)
+		mxs_reg_32(hw_apbh_ch5_debug1)
+		mxs_reg_32(hw_apbh_ch5_debug2)
+		mxs_reg_32(hw_apbh_ch6_curcmdar)
+		mxs_reg_32(hw_apbh_ch6_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch6_cmd)
+		mxs_reg_32(hw_apbh_ch6_bar)
+		mxs_reg_32(hw_apbh_ch6_sema)
+		mxs_reg_32(hw_apbh_ch6_debug1)
+		mxs_reg_32(hw_apbh_ch6_debug2)
+		mxs_reg_32(hw_apbh_ch7_curcmdar)
+		mxs_reg_32(hw_apbh_ch7_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch7_cmd)
+		mxs_reg_32(hw_apbh_ch7_bar)
+		mxs_reg_32(hw_apbh_ch7_sema)
+		mxs_reg_32(hw_apbh_ch7_debug1)
+		mxs_reg_32(hw_apbh_ch7_debug2)
+		mxs_reg_32(hw_apbh_ch8_curcmdar)
+		mxs_reg_32(hw_apbh_ch8_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch8_cmd)
+		mxs_reg_32(hw_apbh_ch8_bar)
+		mxs_reg_32(hw_apbh_ch8_sema)
+		mxs_reg_32(hw_apbh_ch8_debug1)
+		mxs_reg_32(hw_apbh_ch8_debug2)
+		mxs_reg_32(hw_apbh_ch9_curcmdar)
+		mxs_reg_32(hw_apbh_ch9_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch9_cmd)
+		mxs_reg_32(hw_apbh_ch9_bar)
+		mxs_reg_32(hw_apbh_ch9_sema)
+		mxs_reg_32(hw_apbh_ch9_debug1)
+		mxs_reg_32(hw_apbh_ch9_debug2)
+		mxs_reg_32(hw_apbh_ch10_curcmdar)
+		mxs_reg_32(hw_apbh_ch10_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch10_cmd)
+		mxs_reg_32(hw_apbh_ch10_bar)
+		mxs_reg_32(hw_apbh_ch10_sema)
+		mxs_reg_32(hw_apbh_ch10_debug1)
+		mxs_reg_32(hw_apbh_ch10_debug2)
+		mxs_reg_32(hw_apbh_ch11_curcmdar)
+		mxs_reg_32(hw_apbh_ch11_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch11_cmd)
+		mxs_reg_32(hw_apbh_ch11_bar)
+		mxs_reg_32(hw_apbh_ch11_sema)
+		mxs_reg_32(hw_apbh_ch11_debug1)
+		mxs_reg_32(hw_apbh_ch11_debug2)
+		mxs_reg_32(hw_apbh_ch12_curcmdar)
+		mxs_reg_32(hw_apbh_ch12_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch12_cmd)
+		mxs_reg_32(hw_apbh_ch12_bar)
+		mxs_reg_32(hw_apbh_ch12_sema)
+		mxs_reg_32(hw_apbh_ch12_debug1)
+		mxs_reg_32(hw_apbh_ch12_debug2)
+		mxs_reg_32(hw_apbh_ch13_curcmdar)
+		mxs_reg_32(hw_apbh_ch13_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch13_cmd)
+		mxs_reg_32(hw_apbh_ch13_bar)
+		mxs_reg_32(hw_apbh_ch13_sema)
+		mxs_reg_32(hw_apbh_ch13_debug1)
+		mxs_reg_32(hw_apbh_ch13_debug2)
+		mxs_reg_32(hw_apbh_ch14_curcmdar)
+		mxs_reg_32(hw_apbh_ch14_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch14_cmd)
+		mxs_reg_32(hw_apbh_ch14_bar)
+		mxs_reg_32(hw_apbh_ch14_sema)
+		mxs_reg_32(hw_apbh_ch14_debug1)
+		mxs_reg_32(hw_apbh_ch14_debug2)
+		mxs_reg_32(hw_apbh_ch15_curcmdar)
+		mxs_reg_32(hw_apbh_ch15_nxtcmdar)
+		mxs_reg_32(hw_apbh_ch15_cmd)
+		mxs_reg_32(hw_apbh_ch15_bar)
+		mxs_reg_32(hw_apbh_ch15_sema)
+		mxs_reg_32(hw_apbh_ch15_debug1)
+		mxs_reg_32(hw_apbh_ch15_debug2)
 	};
 	};
-	mx28_reg_32(hw_apbh_version)
+	mxs_reg_32(hw_apbh_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-bch.h b/arch/arm/include/asm/arch-mxs/regs-bch.h
index 9243bdd..58517c4 100644
--- a/arch/arm/include/asm/arch-mxs/regs-bch.h
+++ b/arch/arm/include/asm/arch-mxs/regs-bch.h
@@ -30,30 +30,30 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_bch_regs {
-	mx28_reg_32(hw_bch_ctrl)
-	mx28_reg_32(hw_bch_status0)
-	mx28_reg_32(hw_bch_mode)
-	mx28_reg_32(hw_bch_encodeptr)
-	mx28_reg_32(hw_bch_dataptr)
-	mx28_reg_32(hw_bch_metaptr)
+	mxs_reg_32(hw_bch_ctrl)
+	mxs_reg_32(hw_bch_status0)
+	mxs_reg_32(hw_bch_mode)
+	mxs_reg_32(hw_bch_encodeptr)
+	mxs_reg_32(hw_bch_dataptr)
+	mxs_reg_32(hw_bch_metaptr)
 
 	uint32_t	reserved[4];
 
-	mx28_reg_32(hw_bch_layoutselect)
-	mx28_reg_32(hw_bch_flash0layout0)
-	mx28_reg_32(hw_bch_flash0layout1)
-	mx28_reg_32(hw_bch_flash1layout0)
-	mx28_reg_32(hw_bch_flash1layout1)
-	mx28_reg_32(hw_bch_flash2layout0)
-	mx28_reg_32(hw_bch_flash2layout1)
-	mx28_reg_32(hw_bch_flash3layout0)
-	mx28_reg_32(hw_bch_flash3layout1)
-	mx28_reg_32(hw_bch_dbgkesread)
-	mx28_reg_32(hw_bch_dbgcsferead)
-	mx28_reg_32(hw_bch_dbgsyndegread)
-	mx28_reg_32(hw_bch_dbgahbmread)
-	mx28_reg_32(hw_bch_blockname)
-	mx28_reg_32(hw_bch_version)
+	mxs_reg_32(hw_bch_layoutselect)
+	mxs_reg_32(hw_bch_flash0layout0)
+	mxs_reg_32(hw_bch_flash0layout1)
+	mxs_reg_32(hw_bch_flash1layout0)
+	mxs_reg_32(hw_bch_flash1layout1)
+	mxs_reg_32(hw_bch_flash2layout0)
+	mxs_reg_32(hw_bch_flash2layout1)
+	mxs_reg_32(hw_bch_flash3layout0)
+	mxs_reg_32(hw_bch_flash3layout1)
+	mxs_reg_32(hw_bch_dbgkesread)
+	mxs_reg_32(hw_bch_dbgcsferead)
+	mxs_reg_32(hw_bch_dbgsyndegread)
+	mxs_reg_32(hw_bch_dbgahbmread)
+	mxs_reg_32(hw_bch_blockname)
+	mxs_reg_32(hw_bch_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl.h
index 3c4947d..127370b 100644
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl.h
@@ -30,38 +30,38 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_clkctrl_regs {
-	mx28_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
-	mx28_reg_32(hw_clkctrl_pll0ctrl1)	/* 0x10 */
-	mx28_reg_32(hw_clkctrl_pll1ctrl0)	/* 0x20 */
-	mx28_reg_32(hw_clkctrl_pll1ctrl1)	/* 0x30 */
-	mx28_reg_32(hw_clkctrl_pll2ctrl0)	/* 0x40 */
-	mx28_reg_32(hw_clkctrl_cpu)		/* 0x50 */
-	mx28_reg_32(hw_clkctrl_hbus)		/* 0x60 */
-	mx28_reg_32(hw_clkctrl_xbus)		/* 0x70 */
-	mx28_reg_32(hw_clkctrl_xtal)		/* 0x80 */
-	mx28_reg_32(hw_clkctrl_ssp0)		/* 0x90 */
-	mx28_reg_32(hw_clkctrl_ssp1)		/* 0xa0 */
-	mx28_reg_32(hw_clkctrl_ssp2)		/* 0xb0 */
-	mx28_reg_32(hw_clkctrl_ssp3)		/* 0xc0 */
-	mx28_reg_32(hw_clkctrl_gpmi)		/* 0xd0 */
-	mx28_reg_32(hw_clkctrl_spdif)		/* 0xe0 */
-	mx28_reg_32(hw_clkctrl_emi)		/* 0xf0 */
-	mx28_reg_32(hw_clkctrl_saif0)		/* 0x100 */
-	mx28_reg_32(hw_clkctrl_saif1)		/* 0x110 */
-	mx28_reg_32(hw_clkctrl_lcdif)		/* 0x120 */
-	mx28_reg_32(hw_clkctrl_etm)		/* 0x130 */
-	mx28_reg_32(hw_clkctrl_enet)		/* 0x140 */
-	mx28_reg_32(hw_clkctrl_hsadc)		/* 0x150 */
-	mx28_reg_32(hw_clkctrl_flexcan)		/* 0x160 */
+	mxs_reg_32(hw_clkctrl_pll0ctrl0)	/* 0x00 */
+	mxs_reg_32(hw_clkctrl_pll0ctrl1)	/* 0x10 */
+	mxs_reg_32(hw_clkctrl_pll1ctrl0)	/* 0x20 */
+	mxs_reg_32(hw_clkctrl_pll1ctrl1)	/* 0x30 */
+	mxs_reg_32(hw_clkctrl_pll2ctrl0)	/* 0x40 */
+	mxs_reg_32(hw_clkctrl_cpu)		/* 0x50 */
+	mxs_reg_32(hw_clkctrl_hbus)		/* 0x60 */
+	mxs_reg_32(hw_clkctrl_xbus)		/* 0x70 */
+	mxs_reg_32(hw_clkctrl_xtal)		/* 0x80 */
+	mxs_reg_32(hw_clkctrl_ssp0)		/* 0x90 */
+	mxs_reg_32(hw_clkctrl_ssp1)		/* 0xa0 */
+	mxs_reg_32(hw_clkctrl_ssp2)		/* 0xb0 */
+	mxs_reg_32(hw_clkctrl_ssp3)		/* 0xc0 */
+	mxs_reg_32(hw_clkctrl_gpmi)		/* 0xd0 */
+	mxs_reg_32(hw_clkctrl_spdif)		/* 0xe0 */
+	mxs_reg_32(hw_clkctrl_emi)		/* 0xf0 */
+	mxs_reg_32(hw_clkctrl_saif0)		/* 0x100 */
+	mxs_reg_32(hw_clkctrl_saif1)		/* 0x110 */
+	mxs_reg_32(hw_clkctrl_lcdif)		/* 0x120 */
+	mxs_reg_32(hw_clkctrl_etm)		/* 0x130 */
+	mxs_reg_32(hw_clkctrl_enet)		/* 0x140 */
+	mxs_reg_32(hw_clkctrl_hsadc)		/* 0x150 */
+	mxs_reg_32(hw_clkctrl_flexcan)		/* 0x160 */
 
 	uint32_t	reserved[16];
 
-	mx28_reg_8(hw_clkctrl_frac0)		/* 0x1b0 */
-	mx28_reg_8(hw_clkctrl_frac1)		/* 0x1c0 */
-	mx28_reg_32(hw_clkctrl_clkseq)		/* 0x1d0 */
-	mx28_reg_32(hw_clkctrl_reset)		/* 0x1e0 */
-	mx28_reg_32(hw_clkctrl_status)		/* 0x1f0 */
-	mx28_reg_32(hw_clkctrl_version)		/* 0x200 */
+	mxs_reg_8(hw_clkctrl_frac0)		/* 0x1b0 */
+	mxs_reg_8(hw_clkctrl_frac1)		/* 0x1c0 */
+	mxs_reg_32(hw_clkctrl_clkseq)		/* 0x1d0 */
+	mxs_reg_32(hw_clkctrl_reset)		/* 0x1e0 */
+	mxs_reg_32(hw_clkctrl_status)		/* 0x1f0 */
+	mxs_reg_32(hw_clkctrl_version)		/* 0x200 */
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-common.h b/arch/arm/include/asm/arch-mxs/regs-common.h
index d2e1953..bcea419 100644
--- a/arch/arm/include/asm/arch-mxs/regs-common.h
+++ b/arch/arm/include/asm/arch-mxs/regs-common.h
@@ -1,5 +1,5 @@
 /*
- * Freescale i.MX28 Register Accessors
+ * Freescale i.MXS Register Accessors
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef __MX28_REGS_COMMON_H__
-#define __MX28_REGS_COMMON_H__
+#ifndef __MXS_REGS_COMMON_H__
+#define __MXS_REGS_COMMON_H__
 
 /*
- * The i.MX28 has interesting feature when it comes to register access. There
+ * The i.MXS has interesting feature when it comes to register access. There
  * are four kinds of access to one particular register. Those are:
  *
  * 1) Common read/write access. To use this mode, just write to the address of
@@ -47,36 +47,36 @@
  *
  */
 
-#define	__mx28_reg_8(name)		\
+#define	__mxs_reg_8(name)		\
 	uint8_t	name[4];		\
 	uint8_t	name##_set[4];		\
 	uint8_t	name##_clr[4];		\
 	uint8_t	name##_tog[4];		\
 
-#define	__mx28_reg_32(name)		\
+#define	__mxs_reg_32(name)		\
 	uint32_t name;			\
 	uint32_t name##_set;		\
 	uint32_t name##_clr;		\
 	uint32_t name##_tog;
 
-struct mx28_register_8 {
-	__mx28_reg_8(reg)
+struct mxs_register_8 {
+	__mxs_reg_8(reg)
 };
 
-struct mx28_register_32 {
-	__mx28_reg_32(reg)
+struct mxs_register_32 {
+	__mxs_reg_32(reg)
 };
 
-#define	mx28_reg_8(name)				\
+#define	mxs_reg_8(name)				\
 	union {						\
-		struct { __mx28_reg_8(name) };		\
-		struct mx28_register_8 name##_reg;	\
+		struct { __mxs_reg_8(name) };		\
+		struct mxs_register_8 name##_reg;	\
 	};
 
-#define	mx28_reg_32(name)				\
+#define	mxs_reg_32(name)				\
 	union {						\
-		struct { __mx28_reg_32(name) };		\
-		struct mx28_register_32 name##_reg;	\
+		struct { __mxs_reg_32(name) };		\
+		struct mxs_register_32 name##_reg;	\
 	};
 
-#endif	/* __MX28_REGS_COMMON_H__ */
+#endif	/* __MXS_REGS_COMMON_H__ */
diff --git a/arch/arm/include/asm/arch-mxs/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h
index 9a63594..25d318f 100644
--- a/arch/arm/include/asm/arch-mxs/regs-digctl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-digctl.h
@@ -26,16 +26,16 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_digctl_regs {
-	mx28_reg_32(hw_digctl_ctrl)				/* 0x000 */
-	mx28_reg_32(hw_digctl_status)				/* 0x010 */
-	mx28_reg_32(hw_digctl_hclkcount)			/* 0x020 */
-	mx28_reg_32(hw_digctl_ramctrl)				/* 0x030 */
-	mx28_reg_32(hw_digctl_emi_status)			/* 0x040 */
-	mx28_reg_32(hw_digctl_read_margin)			/* 0x050 */
+	mxs_reg_32(hw_digctl_ctrl)				/* 0x000 */
+	mxs_reg_32(hw_digctl_status)				/* 0x010 */
+	mxs_reg_32(hw_digctl_hclkcount)			/* 0x020 */
+	mxs_reg_32(hw_digctl_ramctrl)				/* 0x030 */
+	mxs_reg_32(hw_digctl_emi_status)			/* 0x040 */
+	mxs_reg_32(hw_digctl_read_margin)			/* 0x050 */
 	uint32_t	hw_digctl_writeonce;			/* 0x060 */
 	uint32_t	reserved_writeonce[3];
-	mx28_reg_32(hw_digctl_bist_ctl)				/* 0x070 */
-	mx28_reg_32(hw_digctl_bist_status)			/* 0x080 */
+	mxs_reg_32(hw_digctl_bist_ctl)				/* 0x070 */
+	mxs_reg_32(hw_digctl_bist_status)			/* 0x080 */
 	uint32_t	hw_digctl_entropy;			/* 0x090 */
 	uint32_t	reserved_entropy[3];
 	uint32_t	hw_digctl_entropy_latched;		/* 0x0a0 */
@@ -43,7 +43,7 @@ struct mx28_digctl_regs {
 
 	uint32_t	reserved1[4];
 
-	mx28_reg_32(hw_digctl_microseconds)			/* 0x0c0 */
+	mxs_reg_32(hw_digctl_microseconds)			/* 0x0c0 */
 	uint32_t	hw_digctl_dbgrd;			/* 0x0d0 */
 	uint32_t	reserved_hw_digctl_dbgrd[3];
 	uint32_t	hw_digctl_dbg;				/* 0x0e0 */
@@ -51,21 +51,21 @@ struct mx28_digctl_regs {
 
 	uint32_t	reserved2[4];
 
-	mx28_reg_32(hw_digctl_usb_loopback)			/* 0x100 */
-	mx28_reg_32(hw_digctl_ocram_status0)			/* 0x110 */
-	mx28_reg_32(hw_digctl_ocram_status1)			/* 0x120 */
-	mx28_reg_32(hw_digctl_ocram_status2)			/* 0x130 */
-	mx28_reg_32(hw_digctl_ocram_status3)			/* 0x140 */
-	mx28_reg_32(hw_digctl_ocram_status4)			/* 0x150 */
-	mx28_reg_32(hw_digctl_ocram_status5)			/* 0x160 */
-	mx28_reg_32(hw_digctl_ocram_status6)			/* 0x170 */
-	mx28_reg_32(hw_digctl_ocram_status7)			/* 0x180 */
-	mx28_reg_32(hw_digctl_ocram_status8)			/* 0x190 */
-	mx28_reg_32(hw_digctl_ocram_status9)			/* 0x1a0 */
-	mx28_reg_32(hw_digctl_ocram_status10)			/* 0x1b0 */
-	mx28_reg_32(hw_digctl_ocram_status11)			/* 0x1c0 */
-	mx28_reg_32(hw_digctl_ocram_status12)			/* 0x1d0 */
-	mx28_reg_32(hw_digctl_ocram_status13)			/* 0x1e0 */
+	mxs_reg_32(hw_digctl_usb_loopback)			/* 0x100 */
+	mxs_reg_32(hw_digctl_ocram_status0)			/* 0x110 */
+	mxs_reg_32(hw_digctl_ocram_status1)			/* 0x120 */
+	mxs_reg_32(hw_digctl_ocram_status2)			/* 0x130 */
+	mxs_reg_32(hw_digctl_ocram_status3)			/* 0x140 */
+	mxs_reg_32(hw_digctl_ocram_status4)			/* 0x150 */
+	mxs_reg_32(hw_digctl_ocram_status5)			/* 0x160 */
+	mxs_reg_32(hw_digctl_ocram_status6)			/* 0x170 */
+	mxs_reg_32(hw_digctl_ocram_status7)			/* 0x180 */
+	mxs_reg_32(hw_digctl_ocram_status8)			/* 0x190 */
+	mxs_reg_32(hw_digctl_ocram_status9)			/* 0x1a0 */
+	mxs_reg_32(hw_digctl_ocram_status10)			/* 0x1b0 */
+	mxs_reg_32(hw_digctl_ocram_status11)			/* 0x1c0 */
+	mxs_reg_32(hw_digctl_ocram_status12)			/* 0x1d0 */
+	mxs_reg_32(hw_digctl_ocram_status13)			/* 0x1e0 */
 
 	uint32_t	reserved3[36];
 
@@ -75,7 +75,7 @@ struct mx28_digctl_regs {
 	uint32_t	reserved_hw_digctl_scratch1[3];
 	uint32_t	hw_digctl_armcache;			/* 0x2a0 */
 	uint32_t	reserved_hw_digctl_armcache[3];
-	mx28_reg_32(hw_digctl_debug_trap)			/* 0x2b0 */
+	mxs_reg_32(hw_digctl_debug_trap)			/* 0x2b0 */
 	uint32_t	hw_digctl_debug_trap_l0_addr_low;	/* 0x2c0 */
 	uint32_t	reserved_hw_digctl_debug_trap_l0_addr_low[3];
 	uint32_t	hw_digctl_debug_trap_l0_addr_high;	/* 0x2d0 */
diff --git a/arch/arm/include/asm/arch-mxs/regs-gpmi.h b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
index 1b487f4..190a570 100644
--- a/arch/arm/include/asm/arch-mxs/regs-gpmi.h
+++ b/arch/arm/include/asm/arch-mxs/regs-gpmi.h
@@ -30,22 +30,22 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_gpmi_regs {
-	mx28_reg_32(hw_gpmi_ctrl0)
-	mx28_reg_32(hw_gpmi_compare)
-	mx28_reg_32(hw_gpmi_eccctrl)
-	mx28_reg_32(hw_gpmi_ecccount)
-	mx28_reg_32(hw_gpmi_payload)
-	mx28_reg_32(hw_gpmi_auxiliary)
-	mx28_reg_32(hw_gpmi_ctrl1)
-	mx28_reg_32(hw_gpmi_timing0)
-	mx28_reg_32(hw_gpmi_timing1)
+	mxs_reg_32(hw_gpmi_ctrl0)
+	mxs_reg_32(hw_gpmi_compare)
+	mxs_reg_32(hw_gpmi_eccctrl)
+	mxs_reg_32(hw_gpmi_ecccount)
+	mxs_reg_32(hw_gpmi_payload)
+	mxs_reg_32(hw_gpmi_auxiliary)
+	mxs_reg_32(hw_gpmi_ctrl1)
+	mxs_reg_32(hw_gpmi_timing0)
+	mxs_reg_32(hw_gpmi_timing1)
 
 	uint32_t	reserved[4];
 
-	mx28_reg_32(hw_gpmi_data)
-	mx28_reg_32(hw_gpmi_stat)
-	mx28_reg_32(hw_gpmi_debug)
-	mx28_reg_32(hw_gpmi_version)
+	mxs_reg_32(hw_gpmi_data)
+	mxs_reg_32(hw_gpmi_stat)
+	mxs_reg_32(hw_gpmi_debug)
+	mxs_reg_32(hw_gpmi_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h
index 2e2e814..418a3c0 100644
--- a/arch/arm/include/asm/arch-mxs/regs-i2c.h
+++ b/arch/arm/include/asm/arch-mxs/regs-i2c.h
@@ -27,20 +27,20 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_i2c_regs {
-	mx28_reg_32(hw_i2c_ctrl0)
-	mx28_reg_32(hw_i2c_timing0)
-	mx28_reg_32(hw_i2c_timing1)
-	mx28_reg_32(hw_i2c_timing2)
-	mx28_reg_32(hw_i2c_ctrl1)
-	mx28_reg_32(hw_i2c_stat)
-	mx28_reg_32(hw_i2c_queuectrl)
-	mx28_reg_32(hw_i2c_queuestat)
-	mx28_reg_32(hw_i2c_queuecmd)
-	mx28_reg_32(hw_i2c_queuedata)
-	mx28_reg_32(hw_i2c_data)
-	mx28_reg_32(hw_i2c_debug0)
-	mx28_reg_32(hw_i2c_debug1)
-	mx28_reg_32(hw_i2c_version)
+	mxs_reg_32(hw_i2c_ctrl0)
+	mxs_reg_32(hw_i2c_timing0)
+	mxs_reg_32(hw_i2c_timing1)
+	mxs_reg_32(hw_i2c_timing2)
+	mxs_reg_32(hw_i2c_ctrl1)
+	mxs_reg_32(hw_i2c_stat)
+	mxs_reg_32(hw_i2c_queuectrl)
+	mxs_reg_32(hw_i2c_queuestat)
+	mxs_reg_32(hw_i2c_queuecmd)
+	mxs_reg_32(hw_i2c_queuedata)
+	mxs_reg_32(hw_i2c_data)
+	mxs_reg_32(hw_i2c_debug0)
+	mxs_reg_32(hw_i2c_debug1)
+	mxs_reg_32(hw_i2c_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-lcdif.h b/arch/arm/include/asm/arch-mxs/regs-lcdif.h
index cb47e41..87bfa0d 100644
--- a/arch/arm/include/asm/arch-mxs/regs-lcdif.h
+++ b/arch/arm/include/asm/arch-mxs/regs-lcdif.h
@@ -30,38 +30,38 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_lcdif_regs {
-	mx28_reg_32(hw_lcdif_ctrl)		/* 0x00 */
-	mx28_reg_32(hw_lcdif_ctrl1)		/* 0x10 */
-	mx28_reg_32(hw_lcdif_ctrl2)		/* 0x20 */
-	mx28_reg_32(hw_lcdif_transfer_count)	/* 0x30 */
-	mx28_reg_32(hw_lcdif_cur_buf)		/* 0x40 */
-	mx28_reg_32(hw_lcdif_next_buf)		/* 0x50 */
-	mx28_reg_32(hw_lcdif_timing)		/* 0x60 */
-	mx28_reg_32(hw_lcdif_vdctrl0)		/* 0x70 */
-	mx28_reg_32(hw_lcdif_vdctrl1)		/* 0x80 */
-	mx28_reg_32(hw_lcdif_vdctrl2)		/* 0x90 */
-	mx28_reg_32(hw_lcdif_vdctrl3)		/* 0xa0 */
-	mx28_reg_32(hw_lcdif_vdctrl4)		/* 0xb0 */
-	mx28_reg_32(hw_lcdif_dvictrl0)		/* 0xc0 */
-	mx28_reg_32(hw_lcdif_dvictrl1)		/* 0xd0 */
-	mx28_reg_32(hw_lcdif_dvictrl2)		/* 0xe0 */
-	mx28_reg_32(hw_lcdif_dvictrl3)		/* 0xf0 */
-	mx28_reg_32(hw_lcdif_dvictrl4)		/* 0x100 */
-	mx28_reg_32(hw_lcdif_csc_coeffctrl0)	/* 0x110 */
-	mx28_reg_32(hw_lcdif_csc_coeffctrl1)	/* 0x120 */
-	mx28_reg_32(hw_lcdif_csc_coeffctrl2)	/* 0x130 */
-	mx28_reg_32(hw_lcdif_csc_coeffctrl3)	/* 0x140 */
-	mx28_reg_32(hw_lcdif_csc_coeffctrl4)	/* 0x150 */
-	mx28_reg_32(hw_lcdif_csc_offset)	/* 0x160 */
-	mx28_reg_32(hw_lcdif_csc_limit)		/* 0x170 */
-	mx28_reg_32(hw_lcdif_data)		/* 0x180 */
-	mx28_reg_32(hw_lcdif_bm_error_stat)	/* 0x190 */
-	mx28_reg_32(hw_lcdif_crc_stat)		/* 0x1a0 */
-	mx28_reg_32(hw_lcdif_lcdif_stat)	/* 0x1b0 */
-	mx28_reg_32(hw_lcdif_version)		/* 0x1c0 */
-	mx28_reg_32(hw_lcdif_debug0)		/* 0x1d0 */
-	mx28_reg_32(hw_lcdif_debug1)		/* 0x1e0 */
-	mx28_reg_32(hw_lcdif_debug2)		/* 0x1f0 */
+	mxs_reg_32(hw_lcdif_ctrl)		/* 0x00 */
+	mxs_reg_32(hw_lcdif_ctrl1)		/* 0x10 */
+	mxs_reg_32(hw_lcdif_ctrl2)		/* 0x20 */
+	mxs_reg_32(hw_lcdif_transfer_count)	/* 0x30 */
+	mxs_reg_32(hw_lcdif_cur_buf)		/* 0x40 */
+	mxs_reg_32(hw_lcdif_next_buf)		/* 0x50 */
+	mxs_reg_32(hw_lcdif_timing)		/* 0x60 */
+	mxs_reg_32(hw_lcdif_vdctrl0)		/* 0x70 */
+	mxs_reg_32(hw_lcdif_vdctrl1)		/* 0x80 */
+	mxs_reg_32(hw_lcdif_vdctrl2)		/* 0x90 */
+	mxs_reg_32(hw_lcdif_vdctrl3)		/* 0xa0 */
+	mxs_reg_32(hw_lcdif_vdctrl4)		/* 0xb0 */
+	mxs_reg_32(hw_lcdif_dvictrl0)		/* 0xc0 */
+	mxs_reg_32(hw_lcdif_dvictrl1)		/* 0xd0 */
+	mxs_reg_32(hw_lcdif_dvictrl2)		/* 0xe0 */
+	mxs_reg_32(hw_lcdif_dvictrl3)		/* 0xf0 */
+	mxs_reg_32(hw_lcdif_dvictrl4)		/* 0x100 */
+	mxs_reg_32(hw_lcdif_csc_coeffctrl0)	/* 0x110 */
+	mxs_reg_32(hw_lcdif_csc_coeffctrl1)	/* 0x120 */
+	mxs_reg_32(hw_lcdif_csc_coeffctrl2)	/* 0x130 */
+	mxs_reg_32(hw_lcdif_csc_coeffctrl3)	/* 0x140 */
+	mxs_reg_32(hw_lcdif_csc_coeffctrl4)	/* 0x150 */
+	mxs_reg_32(hw_lcdif_csc_offset)	/* 0x160 */
+	mxs_reg_32(hw_lcdif_csc_limit)		/* 0x170 */
+	mxs_reg_32(hw_lcdif_data)		/* 0x180 */
+	mxs_reg_32(hw_lcdif_bm_error_stat)	/* 0x190 */
+	mxs_reg_32(hw_lcdif_crc_stat)		/* 0x1a0 */
+	mxs_reg_32(hw_lcdif_lcdif_stat)	/* 0x1b0 */
+	mxs_reg_32(hw_lcdif_version)		/* 0x1c0 */
+	mxs_reg_32(hw_lcdif_debug0)		/* 0x1d0 */
+	mxs_reg_32(hw_lcdif_debug1)		/* 0x1e0 */
+	mxs_reg_32(hw_lcdif_debug2)		/* 0x1f0 */
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-lradc.h b/arch/arm/include/asm/arch-mxs/regs-lradc.h
index 16e2bbf..0054c23 100644
--- a/arch/arm/include/asm/arch-mxs/regs-lradc.h
+++ b/arch/arm/include/asm/arch-mxs/regs-lradc.h
@@ -30,30 +30,30 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_lradc_regs {
-	mx28_reg_32(hw_lradc_ctrl0);
-	mx28_reg_32(hw_lradc_ctrl1);
-	mx28_reg_32(hw_lradc_ctrl2);
-	mx28_reg_32(hw_lradc_ctrl3);
-	mx28_reg_32(hw_lradc_status);
-	mx28_reg_32(hw_lradc_ch0);
-	mx28_reg_32(hw_lradc_ch1);
-	mx28_reg_32(hw_lradc_ch2);
-	mx28_reg_32(hw_lradc_ch3);
-	mx28_reg_32(hw_lradc_ch4);
-	mx28_reg_32(hw_lradc_ch5);
-	mx28_reg_32(hw_lradc_ch6);
-	mx28_reg_32(hw_lradc_ch7);
-	mx28_reg_32(hw_lradc_delay0);
-	mx28_reg_32(hw_lradc_delay1);
-	mx28_reg_32(hw_lradc_delay2);
-	mx28_reg_32(hw_lradc_delay3);
-	mx28_reg_32(hw_lradc_debug0);
-	mx28_reg_32(hw_lradc_debug1);
-	mx28_reg_32(hw_lradc_conversion);
-	mx28_reg_32(hw_lradc_ctrl4);
-	mx28_reg_32(hw_lradc_treshold0);
-	mx28_reg_32(hw_lradc_treshold1);
-	mx28_reg_32(hw_lradc_version);
+	mxs_reg_32(hw_lradc_ctrl0);
+	mxs_reg_32(hw_lradc_ctrl1);
+	mxs_reg_32(hw_lradc_ctrl2);
+	mxs_reg_32(hw_lradc_ctrl3);
+	mxs_reg_32(hw_lradc_status);
+	mxs_reg_32(hw_lradc_ch0);
+	mxs_reg_32(hw_lradc_ch1);
+	mxs_reg_32(hw_lradc_ch2);
+	mxs_reg_32(hw_lradc_ch3);
+	mxs_reg_32(hw_lradc_ch4);
+	mxs_reg_32(hw_lradc_ch5);
+	mxs_reg_32(hw_lradc_ch6);
+	mxs_reg_32(hw_lradc_ch7);
+	mxs_reg_32(hw_lradc_delay0);
+	mxs_reg_32(hw_lradc_delay1);
+	mxs_reg_32(hw_lradc_delay2);
+	mxs_reg_32(hw_lradc_delay3);
+	mxs_reg_32(hw_lradc_debug0);
+	mxs_reg_32(hw_lradc_debug1);
+	mxs_reg_32(hw_lradc_conversion);
+	mxs_reg_32(hw_lradc_ctrl4);
+	mxs_reg_32(hw_lradc_treshold0);
+	mxs_reg_32(hw_lradc_treshold1);
+	mxs_reg_32(hw_lradc_version);
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
index 2738035..a2ac6a2 100644
--- a/arch/arm/include/asm/arch-mxs/regs-ocotp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
@@ -30,49 +30,49 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_ocotp_regs {
-	mx28_reg_32(hw_ocotp_ctrl)	/* 0x0 */
-	mx28_reg_32(hw_ocotp_data)	/* 0x10 */
-	mx28_reg_32(hw_ocotp_cust0)	/* 0x20 */
-	mx28_reg_32(hw_ocotp_cust1)	/* 0x30 */
-	mx28_reg_32(hw_ocotp_cust2)	/* 0x40 */
-	mx28_reg_32(hw_ocotp_cust3)	/* 0x50 */
-	mx28_reg_32(hw_ocotp_crypto0)	/* 0x60 */
-	mx28_reg_32(hw_ocotp_crypto1)	/* 0x70 */
-	mx28_reg_32(hw_ocotp_crypto2)	/* 0x80 */
-	mx28_reg_32(hw_ocotp_crypto3)	/* 0x90 */
-	mx28_reg_32(hw_ocotp_hwcap0)	/* 0xa0 */
-	mx28_reg_32(hw_ocotp_hwcap1)	/* 0xb0 */
-	mx28_reg_32(hw_ocotp_hwcap2)	/* 0xc0 */
-	mx28_reg_32(hw_ocotp_hwcap3)	/* 0xd0 */
-	mx28_reg_32(hw_ocotp_hwcap4)	/* 0xe0 */
-	mx28_reg_32(hw_ocotp_hwcap5)	/* 0xf0 */
-	mx28_reg_32(hw_ocotp_swcap)	/* 0x100 */
-	mx28_reg_32(hw_ocotp_custcap)	/* 0x110 */
-	mx28_reg_32(hw_ocotp_lock)	/* 0x120 */
-	mx28_reg_32(hw_ocotp_ops0)	/* 0x130 */
-	mx28_reg_32(hw_ocotp_ops1)	/* 0x140 */
-	mx28_reg_32(hw_ocotp_ops2)	/* 0x150 */
-	mx28_reg_32(hw_ocotp_ops3)	/* 0x160 */
-	mx28_reg_32(hw_ocotp_un0)	/* 0x170 */
-	mx28_reg_32(hw_ocotp_un1)	/* 0x180 */
-	mx28_reg_32(hw_ocotp_un2)	/* 0x190 */
-	mx28_reg_32(hw_ocotp_rom0)	/* 0x1a0 */
-	mx28_reg_32(hw_ocotp_rom1)	/* 0x1b0 */
-	mx28_reg_32(hw_ocotp_rom2)	/* 0x1c0 */
-	mx28_reg_32(hw_ocotp_rom3)	/* 0x1d0 */
-	mx28_reg_32(hw_ocotp_rom4)	/* 0x1e0 */
-	mx28_reg_32(hw_ocotp_rom5)	/* 0x1f0 */
-	mx28_reg_32(hw_ocotp_rom6)	/* 0x200 */
-	mx28_reg_32(hw_ocotp_rom7)	/* 0x210 */
-	mx28_reg_32(hw_ocotp_srk0)	/* 0x220 */
-	mx28_reg_32(hw_ocotp_srk1)	/* 0x230 */
-	mx28_reg_32(hw_ocotp_srk2)	/* 0x240 */
-	mx28_reg_32(hw_ocotp_srk3)	/* 0x250 */
-	mx28_reg_32(hw_ocotp_srk4)	/* 0x260 */
-	mx28_reg_32(hw_ocotp_srk5)	/* 0x270 */
-	mx28_reg_32(hw_ocotp_srk6)	/* 0x280 */
-	mx28_reg_32(hw_ocotp_srk7)	/* 0x290 */
-	mx28_reg_32(hw_ocotp_version)	/* 0x2a0 */
+	mxs_reg_32(hw_ocotp_ctrl)	/* 0x0 */
+	mxs_reg_32(hw_ocotp_data)	/* 0x10 */
+	mxs_reg_32(hw_ocotp_cust0)	/* 0x20 */
+	mxs_reg_32(hw_ocotp_cust1)	/* 0x30 */
+	mxs_reg_32(hw_ocotp_cust2)	/* 0x40 */
+	mxs_reg_32(hw_ocotp_cust3)	/* 0x50 */
+	mxs_reg_32(hw_ocotp_crypto0)	/* 0x60 */
+	mxs_reg_32(hw_ocotp_crypto1)	/* 0x70 */
+	mxs_reg_32(hw_ocotp_crypto2)	/* 0x80 */
+	mxs_reg_32(hw_ocotp_crypto3)	/* 0x90 */
+	mxs_reg_32(hw_ocotp_hwcap0)	/* 0xa0 */
+	mxs_reg_32(hw_ocotp_hwcap1)	/* 0xb0 */
+	mxs_reg_32(hw_ocotp_hwcap2)	/* 0xc0 */
+	mxs_reg_32(hw_ocotp_hwcap3)	/* 0xd0 */
+	mxs_reg_32(hw_ocotp_hwcap4)	/* 0xe0 */
+	mxs_reg_32(hw_ocotp_hwcap5)	/* 0xf0 */
+	mxs_reg_32(hw_ocotp_swcap)	/* 0x100 */
+	mxs_reg_32(hw_ocotp_custcap)	/* 0x110 */
+	mxs_reg_32(hw_ocotp_lock)	/* 0x120 */
+	mxs_reg_32(hw_ocotp_ops0)	/* 0x130 */
+	mxs_reg_32(hw_ocotp_ops1)	/* 0x140 */
+	mxs_reg_32(hw_ocotp_ops2)	/* 0x150 */
+	mxs_reg_32(hw_ocotp_ops3)	/* 0x160 */
+	mxs_reg_32(hw_ocotp_un0)	/* 0x170 */
+	mxs_reg_32(hw_ocotp_un1)	/* 0x180 */
+	mxs_reg_32(hw_ocotp_un2)	/* 0x190 */
+	mxs_reg_32(hw_ocotp_rom0)	/* 0x1a0 */
+	mxs_reg_32(hw_ocotp_rom1)	/* 0x1b0 */
+	mxs_reg_32(hw_ocotp_rom2)	/* 0x1c0 */
+	mxs_reg_32(hw_ocotp_rom3)	/* 0x1d0 */
+	mxs_reg_32(hw_ocotp_rom4)	/* 0x1e0 */
+	mxs_reg_32(hw_ocotp_rom5)	/* 0x1f0 */
+	mxs_reg_32(hw_ocotp_rom6)	/* 0x200 */
+	mxs_reg_32(hw_ocotp_rom7)	/* 0x210 */
+	mxs_reg_32(hw_ocotp_srk0)	/* 0x220 */
+	mxs_reg_32(hw_ocotp_srk1)	/* 0x230 */
+	mxs_reg_32(hw_ocotp_srk2)	/* 0x240 */
+	mxs_reg_32(hw_ocotp_srk3)	/* 0x250 */
+	mxs_reg_32(hw_ocotp_srk4)	/* 0x260 */
+	mxs_reg_32(hw_ocotp_srk5)	/* 0x270 */
+	mxs_reg_32(hw_ocotp_srk6)	/* 0x280 */
+	mxs_reg_32(hw_ocotp_srk7)	/* 0x290 */
+	mxs_reg_32(hw_ocotp_version)	/* 0x2a0 */
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
index 80dcdf6..ca1d791 100644
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -30,129 +30,129 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_pinctrl_regs {
-	mx28_reg_32(hw_pinctrl_ctrl)		/* 0x0 */
+	mxs_reg_32(hw_pinctrl_ctrl)		/* 0x0 */
 
 	uint32_t	reserved1[60];
 
-	mx28_reg_32(hw_pinctrl_muxsel0)		/* 0x100 */
-	mx28_reg_32(hw_pinctrl_muxsel1)		/* 0x110 */
-	mx28_reg_32(hw_pinctrl_muxsel2)		/* 0x120 */
-	mx28_reg_32(hw_pinctrl_muxsel3)		/* 0x130 */
-	mx28_reg_32(hw_pinctrl_muxsel4)		/* 0x140 */
-	mx28_reg_32(hw_pinctrl_muxsel5)		/* 0x150 */
-	mx28_reg_32(hw_pinctrl_muxsel6)		/* 0x160 */
-	mx28_reg_32(hw_pinctrl_muxsel7)		/* 0x170 */
-	mx28_reg_32(hw_pinctrl_muxsel8)		/* 0x180 */
-	mx28_reg_32(hw_pinctrl_muxsel9)		/* 0x190 */
-	mx28_reg_32(hw_pinctrl_muxsel10)	/* 0x1a0 */
-	mx28_reg_32(hw_pinctrl_muxsel11)	/* 0x1b0 */
-	mx28_reg_32(hw_pinctrl_muxsel12)	/* 0x1c0 */
-	mx28_reg_32(hw_pinctrl_muxsel13)	/* 0x1d0 */
+	mxs_reg_32(hw_pinctrl_muxsel0)		/* 0x100 */
+	mxs_reg_32(hw_pinctrl_muxsel1)		/* 0x110 */
+	mxs_reg_32(hw_pinctrl_muxsel2)		/* 0x120 */
+	mxs_reg_32(hw_pinctrl_muxsel3)		/* 0x130 */
+	mxs_reg_32(hw_pinctrl_muxsel4)		/* 0x140 */
+	mxs_reg_32(hw_pinctrl_muxsel5)		/* 0x150 */
+	mxs_reg_32(hw_pinctrl_muxsel6)		/* 0x160 */
+	mxs_reg_32(hw_pinctrl_muxsel7)		/* 0x170 */
+	mxs_reg_32(hw_pinctrl_muxsel8)		/* 0x180 */
+	mxs_reg_32(hw_pinctrl_muxsel9)		/* 0x190 */
+	mxs_reg_32(hw_pinctrl_muxsel10)	/* 0x1a0 */
+	mxs_reg_32(hw_pinctrl_muxsel11)	/* 0x1b0 */
+	mxs_reg_32(hw_pinctrl_muxsel12)	/* 0x1c0 */
+	mxs_reg_32(hw_pinctrl_muxsel13)	/* 0x1d0 */
 
 	uint32_t	reserved2[72];
 
-	mx28_reg_32(hw_pinctrl_drive0)		/* 0x300 */
-	mx28_reg_32(hw_pinctrl_drive1)		/* 0x310 */
-	mx28_reg_32(hw_pinctrl_drive2)		/* 0x320 */
-	mx28_reg_32(hw_pinctrl_drive3)		/* 0x330 */
-	mx28_reg_32(hw_pinctrl_drive4)		/* 0x340 */
-	mx28_reg_32(hw_pinctrl_drive5)		/* 0x350 */
-	mx28_reg_32(hw_pinctrl_drive6)		/* 0x360 */
-	mx28_reg_32(hw_pinctrl_drive7)		/* 0x370 */
-	mx28_reg_32(hw_pinctrl_drive8)		/* 0x380 */
-	mx28_reg_32(hw_pinctrl_drive9)		/* 0x390 */
-	mx28_reg_32(hw_pinctrl_drive10)		/* 0x3a0 */
-	mx28_reg_32(hw_pinctrl_drive11)		/* 0x3b0 */
-	mx28_reg_32(hw_pinctrl_drive12)		/* 0x3c0 */
-	mx28_reg_32(hw_pinctrl_drive13)		/* 0x3d0 */
-	mx28_reg_32(hw_pinctrl_drive14)		/* 0x3e0 */
-	mx28_reg_32(hw_pinctrl_drive15)		/* 0x3f0 */
-	mx28_reg_32(hw_pinctrl_drive16)		/* 0x400 */
-	mx28_reg_32(hw_pinctrl_drive17)		/* 0x410 */
-	mx28_reg_32(hw_pinctrl_drive18)		/* 0x420 */
-	mx28_reg_32(hw_pinctrl_drive19)		/* 0x430 */
+	mxs_reg_32(hw_pinctrl_drive0)		/* 0x300 */
+	mxs_reg_32(hw_pinctrl_drive1)		/* 0x310 */
+	mxs_reg_32(hw_pinctrl_drive2)		/* 0x320 */
+	mxs_reg_32(hw_pinctrl_drive3)		/* 0x330 */
+	mxs_reg_32(hw_pinctrl_drive4)		/* 0x340 */
+	mxs_reg_32(hw_pinctrl_drive5)		/* 0x350 */
+	mxs_reg_32(hw_pinctrl_drive6)		/* 0x360 */
+	mxs_reg_32(hw_pinctrl_drive7)		/* 0x370 */
+	mxs_reg_32(hw_pinctrl_drive8)		/* 0x380 */
+	mxs_reg_32(hw_pinctrl_drive9)		/* 0x390 */
+	mxs_reg_32(hw_pinctrl_drive10)		/* 0x3a0 */
+	mxs_reg_32(hw_pinctrl_drive11)		/* 0x3b0 */
+	mxs_reg_32(hw_pinctrl_drive12)		/* 0x3c0 */
+	mxs_reg_32(hw_pinctrl_drive13)		/* 0x3d0 */
+	mxs_reg_32(hw_pinctrl_drive14)		/* 0x3e0 */
+	mxs_reg_32(hw_pinctrl_drive15)		/* 0x3f0 */
+	mxs_reg_32(hw_pinctrl_drive16)		/* 0x400 */
+	mxs_reg_32(hw_pinctrl_drive17)		/* 0x410 */
+	mxs_reg_32(hw_pinctrl_drive18)		/* 0x420 */
+	mxs_reg_32(hw_pinctrl_drive19)		/* 0x430 */
 
 	uint32_t	reserved3[112];
 
-	mx28_reg_32(hw_pinctrl_pull0)		/* 0x600 */
-	mx28_reg_32(hw_pinctrl_pull1)		/* 0x610 */
-	mx28_reg_32(hw_pinctrl_pull2)		/* 0x620 */
-	mx28_reg_32(hw_pinctrl_pull3)		/* 0x630 */
-	mx28_reg_32(hw_pinctrl_pull4)		/* 0x640 */
-	mx28_reg_32(hw_pinctrl_pull5)		/* 0x650 */
-	mx28_reg_32(hw_pinctrl_pull6)		/* 0x660 */
+	mxs_reg_32(hw_pinctrl_pull0)		/* 0x600 */
+	mxs_reg_32(hw_pinctrl_pull1)		/* 0x610 */
+	mxs_reg_32(hw_pinctrl_pull2)		/* 0x620 */
+	mxs_reg_32(hw_pinctrl_pull3)		/* 0x630 */
+	mxs_reg_32(hw_pinctrl_pull4)		/* 0x640 */
+	mxs_reg_32(hw_pinctrl_pull5)		/* 0x650 */
+	mxs_reg_32(hw_pinctrl_pull6)		/* 0x660 */
 
 	uint32_t	reserved4[36];
 
-	mx28_reg_32(hw_pinctrl_dout0)		/* 0x700 */
-	mx28_reg_32(hw_pinctrl_dout1)		/* 0x710 */
-	mx28_reg_32(hw_pinctrl_dout2)		/* 0x720 */
-	mx28_reg_32(hw_pinctrl_dout3)		/* 0x730 */
-	mx28_reg_32(hw_pinctrl_dout4)		/* 0x740 */
+	mxs_reg_32(hw_pinctrl_dout0)		/* 0x700 */
+	mxs_reg_32(hw_pinctrl_dout1)		/* 0x710 */
+	mxs_reg_32(hw_pinctrl_dout2)		/* 0x720 */
+	mxs_reg_32(hw_pinctrl_dout3)		/* 0x730 */
+	mxs_reg_32(hw_pinctrl_dout4)		/* 0x740 */
 
 	uint32_t	reserved5[108];
 
-	mx28_reg_32(hw_pinctrl_din0)		/* 0x900 */
-	mx28_reg_32(hw_pinctrl_din1)		/* 0x910 */
-	mx28_reg_32(hw_pinctrl_din2)		/* 0x920 */
-	mx28_reg_32(hw_pinctrl_din3)		/* 0x930 */
-	mx28_reg_32(hw_pinctrl_din4)		/* 0x940 */
+	mxs_reg_32(hw_pinctrl_din0)		/* 0x900 */
+	mxs_reg_32(hw_pinctrl_din1)		/* 0x910 */
+	mxs_reg_32(hw_pinctrl_din2)		/* 0x920 */
+	mxs_reg_32(hw_pinctrl_din3)		/* 0x930 */
+	mxs_reg_32(hw_pinctrl_din4)		/* 0x940 */
 
 	uint32_t	reserved6[108];
 
-	mx28_reg_32(hw_pinctrl_doe0)		/* 0xb00 */
-	mx28_reg_32(hw_pinctrl_doe1)		/* 0xb10 */
-	mx28_reg_32(hw_pinctrl_doe2)		/* 0xb20 */
-	mx28_reg_32(hw_pinctrl_doe3)		/* 0xb30 */
-	mx28_reg_32(hw_pinctrl_doe4)		/* 0xb40 */
+	mxs_reg_32(hw_pinctrl_doe0)		/* 0xb00 */
+	mxs_reg_32(hw_pinctrl_doe1)		/* 0xb10 */
+	mxs_reg_32(hw_pinctrl_doe2)		/* 0xb20 */
+	mxs_reg_32(hw_pinctrl_doe3)		/* 0xb30 */
+	mxs_reg_32(hw_pinctrl_doe4)		/* 0xb40 */
 
 	uint32_t	reserved7[300];
 
-	mx28_reg_32(hw_pinctrl_pin2irq0)	/* 0x1000 */
-	mx28_reg_32(hw_pinctrl_pin2irq1)	/* 0x1010 */
-	mx28_reg_32(hw_pinctrl_pin2irq2)	/* 0x1020 */
-	mx28_reg_32(hw_pinctrl_pin2irq3)	/* 0x1030 */
-	mx28_reg_32(hw_pinctrl_pin2irq4)	/* 0x1040 */
+	mxs_reg_32(hw_pinctrl_pin2irq0)	/* 0x1000 */
+	mxs_reg_32(hw_pinctrl_pin2irq1)	/* 0x1010 */
+	mxs_reg_32(hw_pinctrl_pin2irq2)	/* 0x1020 */
+	mxs_reg_32(hw_pinctrl_pin2irq3)	/* 0x1030 */
+	mxs_reg_32(hw_pinctrl_pin2irq4)	/* 0x1040 */
 
 	uint32_t	reserved8[44];
 
-	mx28_reg_32(hw_pinctrl_irqen0)		/* 0x1100 */
-	mx28_reg_32(hw_pinctrl_irqen1)		/* 0x1110 */
-	mx28_reg_32(hw_pinctrl_irqen2)		/* 0x1120 */
-	mx28_reg_32(hw_pinctrl_irqen3)		/* 0x1130 */
-	mx28_reg_32(hw_pinctrl_irqen4)		/* 0x1140 */
+	mxs_reg_32(hw_pinctrl_irqen0)		/* 0x1100 */
+	mxs_reg_32(hw_pinctrl_irqen1)		/* 0x1110 */
+	mxs_reg_32(hw_pinctrl_irqen2)		/* 0x1120 */
+	mxs_reg_32(hw_pinctrl_irqen3)		/* 0x1130 */
+	mxs_reg_32(hw_pinctrl_irqen4)		/* 0x1140 */
 
 	uint32_t	reserved9[44];
 
-	mx28_reg_32(hw_pinctrl_irqlevel0)	/* 0x1200 */
-	mx28_reg_32(hw_pinctrl_irqlevel1)	/* 0x1210 */
-	mx28_reg_32(hw_pinctrl_irqlevel2)	/* 0x1220 */
-	mx28_reg_32(hw_pinctrl_irqlevel3)	/* 0x1230 */
-	mx28_reg_32(hw_pinctrl_irqlevel4)	/* 0x1240 */
+	mxs_reg_32(hw_pinctrl_irqlevel0)	/* 0x1200 */
+	mxs_reg_32(hw_pinctrl_irqlevel1)	/* 0x1210 */
+	mxs_reg_32(hw_pinctrl_irqlevel2)	/* 0x1220 */
+	mxs_reg_32(hw_pinctrl_irqlevel3)	/* 0x1230 */
+	mxs_reg_32(hw_pinctrl_irqlevel4)	/* 0x1240 */
 
 	uint32_t	reserved10[44];
 
-	mx28_reg_32(hw_pinctrl_irqpol0)		/* 0x1300 */
-	mx28_reg_32(hw_pinctrl_irqpol1)		/* 0x1310 */
-	mx28_reg_32(hw_pinctrl_irqpol2)		/* 0x1320 */
-	mx28_reg_32(hw_pinctrl_irqpol3)		/* 0x1330 */
-	mx28_reg_32(hw_pinctrl_irqpol4)		/* 0x1340 */
+	mxs_reg_32(hw_pinctrl_irqpol0)		/* 0x1300 */
+	mxs_reg_32(hw_pinctrl_irqpol1)		/* 0x1310 */
+	mxs_reg_32(hw_pinctrl_irqpol2)		/* 0x1320 */
+	mxs_reg_32(hw_pinctrl_irqpol3)		/* 0x1330 */
+	mxs_reg_32(hw_pinctrl_irqpol4)		/* 0x1340 */
 
 	uint32_t	reserved11[44];
 
-	mx28_reg_32(hw_pinctrl_irqstat0)	/* 0x1400 */
-	mx28_reg_32(hw_pinctrl_irqstat1)	/* 0x1410 */
-	mx28_reg_32(hw_pinctrl_irqstat2)	/* 0x1420 */
-	mx28_reg_32(hw_pinctrl_irqstat3)	/* 0x1430 */
-	mx28_reg_32(hw_pinctrl_irqstat4)	/* 0x1440 */
+	mxs_reg_32(hw_pinctrl_irqstat0)	/* 0x1400 */
+	mxs_reg_32(hw_pinctrl_irqstat1)	/* 0x1410 */
+	mxs_reg_32(hw_pinctrl_irqstat2)	/* 0x1420 */
+	mxs_reg_32(hw_pinctrl_irqstat3)	/* 0x1430 */
+	mxs_reg_32(hw_pinctrl_irqstat4)	/* 0x1440 */
 
 	uint32_t	reserved12[380];
 
-	mx28_reg_32(hw_pinctrl_emi_odt_ctrl)	/* 0x1a40 */
+	mxs_reg_32(hw_pinctrl_emi_odt_ctrl)	/* 0x1a40 */
 
 	uint32_t	reserved13[76];
 
-	mx28_reg_32(hw_pinctrl_emi_ds_ctrl)	/* 0x1b80 */
+	mxs_reg_32(hw_pinctrl_emi_ds_ctrl)	/* 0x1b80 */
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-power.h b/arch/arm/include/asm/arch-mxs/regs-power.h
index 8eadc6d..3c9e3b0 100644
--- a/arch/arm/include/asm/arch-mxs/regs-power.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power.h
@@ -26,10 +26,10 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_power_regs {
-	mx28_reg_32(hw_power_ctrl)
-	mx28_reg_32(hw_power_5vctrl)
-	mx28_reg_32(hw_power_minpwr)
-	mx28_reg_32(hw_power_charge)
+	mxs_reg_32(hw_power_ctrl)
+	mxs_reg_32(hw_power_5vctrl)
+	mxs_reg_32(hw_power_minpwr)
+	mxs_reg_32(hw_power_charge)
 	uint32_t	hw_power_vdddctrl;
 	uint32_t	reserved_vddd[3];
 	uint32_t	hw_power_vddactrl;
@@ -44,23 +44,23 @@ struct mx28_power_regs {
 	uint32_t	reserved_misc[3];
 	uint32_t	hw_power_dclimits;
 	uint32_t	reserved_dclimits[3];
-	mx28_reg_32(hw_power_loopctrl)
+	mxs_reg_32(hw_power_loopctrl)
 	uint32_t	hw_power_sts;
 	uint32_t	reserved_sts[3];
-	mx28_reg_32(hw_power_speed)
+	mxs_reg_32(hw_power_speed)
 	uint32_t	hw_power_battmonitor;
 	uint32_t	reserved_battmonitor[3];
 
 	uint32_t	reserved[4];
 
-	mx28_reg_32(hw_power_reset)
-	mx28_reg_32(hw_power_debug)
-	mx28_reg_32(hw_power_thermal)
-	mx28_reg_32(hw_power_usb1ctrl)
-	mx28_reg_32(hw_power_special)
-	mx28_reg_32(hw_power_version)
-	mx28_reg_32(hw_power_anaclkctrl)
-	mx28_reg_32(hw_power_refctrl)
+	mxs_reg_32(hw_power_reset)
+	mxs_reg_32(hw_power_debug)
+	mxs_reg_32(hw_power_thermal)
+	mxs_reg_32(hw_power_usb1ctrl)
+	mxs_reg_32(hw_power_special)
+	mxs_reg_32(hw_power_version)
+	mxs_reg_32(hw_power_anaclkctrl)
+	mxs_reg_32(hw_power_refctrl)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-rtc.h b/arch/arm/include/asm/arch-mxs/regs-rtc.h
index e605a03..0b660ae 100644
--- a/arch/arm/include/asm/arch-mxs/regs-rtc.h
+++ b/arch/arm/include/asm/arch-mxs/regs-rtc.h
@@ -27,20 +27,20 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_rtc_regs {
-	mx28_reg_32(hw_rtc_ctrl)
-	mx28_reg_32(hw_rtc_stat)
-	mx28_reg_32(hw_rtc_milliseconds)
-	mx28_reg_32(hw_rtc_seconds)
-	mx28_reg_32(hw_rtc_rtc_alarm)
-	mx28_reg_32(hw_rtc_watchdog)
-	mx28_reg_32(hw_rtc_persistent0)
-	mx28_reg_32(hw_rtc_persistent1)
-	mx28_reg_32(hw_rtc_persistent2)
-	mx28_reg_32(hw_rtc_persistent3)
-	mx28_reg_32(hw_rtc_persistent4)
-	mx28_reg_32(hw_rtc_persistent5)
-	mx28_reg_32(hw_rtc_debug)
-	mx28_reg_32(hw_rtc_version)
+	mxs_reg_32(hw_rtc_ctrl)
+	mxs_reg_32(hw_rtc_stat)
+	mxs_reg_32(hw_rtc_milliseconds)
+	mxs_reg_32(hw_rtc_seconds)
+	mxs_reg_32(hw_rtc_rtc_alarm)
+	mxs_reg_32(hw_rtc_watchdog)
+	mxs_reg_32(hw_rtc_persistent0)
+	mxs_reg_32(hw_rtc_persistent1)
+	mxs_reg_32(hw_rtc_persistent2)
+	mxs_reg_32(hw_rtc_persistent3)
+	mxs_reg_32(hw_rtc_persistent4)
+	mxs_reg_32(hw_rtc_persistent5)
+	mxs_reg_32(hw_rtc_debug)
+	mxs_reg_32(hw_rtc_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h
index be71d48..85b9894 100644
--- a/arch/arm/include/asm/arch-mxs/regs-ssp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ssp.h
@@ -29,26 +29,26 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_ssp_regs {
-	mx28_reg_32(hw_ssp_ctrl0)
-	mx28_reg_32(hw_ssp_cmd0)
-	mx28_reg_32(hw_ssp_cmd1)
-	mx28_reg_32(hw_ssp_xfer_size)
-	mx28_reg_32(hw_ssp_block_size)
-	mx28_reg_32(hw_ssp_compref)
-	mx28_reg_32(hw_ssp_compmask)
-	mx28_reg_32(hw_ssp_timing)
-	mx28_reg_32(hw_ssp_ctrl1)
-	mx28_reg_32(hw_ssp_data)
-	mx28_reg_32(hw_ssp_sdresp0)
-	mx28_reg_32(hw_ssp_sdresp1)
-	mx28_reg_32(hw_ssp_sdresp2)
-	mx28_reg_32(hw_ssp_sdresp3)
-	mx28_reg_32(hw_ssp_ddr_ctrl)
-	mx28_reg_32(hw_ssp_dll_ctrl)
-	mx28_reg_32(hw_ssp_status)
-	mx28_reg_32(hw_ssp_dll_sts)
-	mx28_reg_32(hw_ssp_debug)
-	mx28_reg_32(hw_ssp_version)
+	mxs_reg_32(hw_ssp_ctrl0)
+	mxs_reg_32(hw_ssp_cmd0)
+	mxs_reg_32(hw_ssp_cmd1)
+	mxs_reg_32(hw_ssp_xfer_size)
+	mxs_reg_32(hw_ssp_block_size)
+	mxs_reg_32(hw_ssp_compref)
+	mxs_reg_32(hw_ssp_compmask)
+	mxs_reg_32(hw_ssp_timing)
+	mxs_reg_32(hw_ssp_ctrl1)
+	mxs_reg_32(hw_ssp_data)
+	mxs_reg_32(hw_ssp_sdresp0)
+	mxs_reg_32(hw_ssp_sdresp1)
+	mxs_reg_32(hw_ssp_sdresp2)
+	mxs_reg_32(hw_ssp_sdresp3)
+	mxs_reg_32(hw_ssp_ddr_ctrl)
+	mxs_reg_32(hw_ssp_dll_ctrl)
+	mxs_reg_32(hw_ssp_status)
+	mxs_reg_32(hw_ssp_dll_sts)
+	mxs_reg_32(hw_ssp_debug)
+	mxs_reg_32(hw_ssp_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h
index 3e8dfe7..332654f 100644
--- a/arch/arm/include/asm/arch-mxs/regs-timrot.h
+++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h
@@ -29,25 +29,25 @@
 
 #ifndef	__ASSEMBLY__
 struct mx28_timrot_regs {
-	mx28_reg_32(hw_timrot_rotctrl)
-	mx28_reg_32(hw_timrot_rotcount)
-	mx28_reg_32(hw_timrot_timctrl0)
-	mx28_reg_32(hw_timrot_running_count0)
-	mx28_reg_32(hw_timrot_fixed_count0)
-	mx28_reg_32(hw_timrot_match_count0)
-	mx28_reg_32(hw_timrot_timctrl1)
-	mx28_reg_32(hw_timrot_running_count1)
-	mx28_reg_32(hw_timrot_fixed_count1)
-	mx28_reg_32(hw_timrot_match_count1)
-	mx28_reg_32(hw_timrot_timctrl2)
-	mx28_reg_32(hw_timrot_running_count2)
-	mx28_reg_32(hw_timrot_fixed_count2)
-	mx28_reg_32(hw_timrot_match_count2)
-	mx28_reg_32(hw_timrot_timctrl3)
-	mx28_reg_32(hw_timrot_running_count3)
-	mx28_reg_32(hw_timrot_fixed_count3)
-	mx28_reg_32(hw_timrot_match_count3)
-	mx28_reg_32(hw_timrot_version)
+	mxs_reg_32(hw_timrot_rotctrl)
+	mxs_reg_32(hw_timrot_rotcount)
+	mxs_reg_32(hw_timrot_timctrl0)
+	mxs_reg_32(hw_timrot_running_count0)
+	mxs_reg_32(hw_timrot_fixed_count0)
+	mxs_reg_32(hw_timrot_match_count0)
+	mxs_reg_32(hw_timrot_timctrl1)
+	mxs_reg_32(hw_timrot_running_count1)
+	mxs_reg_32(hw_timrot_fixed_count1)
+	mxs_reg_32(hw_timrot_match_count1)
+	mxs_reg_32(hw_timrot_timctrl2)
+	mxs_reg_32(hw_timrot_running_count2)
+	mxs_reg_32(hw_timrot_fixed_count2)
+	mxs_reg_32(hw_timrot_match_count2)
+	mxs_reg_32(hw_timrot_timctrl3)
+	mxs_reg_32(hw_timrot_running_count3)
+	mxs_reg_32(hw_timrot_fixed_count3)
+	mxs_reg_32(hw_timrot_match_count3)
+	mxs_reg_32(hw_timrot_version)
 };
 #endif
 
diff --git a/arch/arm/include/asm/arch-mxs/regs-usbphy.h b/arch/arm/include/asm/arch-mxs/regs-usbphy.h
index 0291d81..5dd5125 100644
--- a/arch/arm/include/asm/arch-mxs/regs-usbphy.h
+++ b/arch/arm/include/asm/arch-mxs/regs-usbphy.h
@@ -24,16 +24,16 @@
 #define __REGS_USBPHY_H__
 
 struct mx28_usbphy_regs {
-	mx28_reg_32(hw_usbphy_pwd)
-	mx28_reg_32(hw_usbphy_tx)
-	mx28_reg_32(hw_usbphy_rx)
-	mx28_reg_32(hw_usbphy_ctrl)
-	mx28_reg_32(hw_usbphy_status)
-	mx28_reg_32(hw_usbphy_debug)
-	mx28_reg_32(hw_usbphy_debug0_status)
-	mx28_reg_32(hw_usbphy_debug1)
-	mx28_reg_32(hw_usbphy_version)
-	mx28_reg_32(hw_usbphy_ip)
+	mxs_reg_32(hw_usbphy_pwd)
+	mxs_reg_32(hw_usbphy_tx)
+	mxs_reg_32(hw_usbphy_rx)
+	mxs_reg_32(hw_usbphy_ctrl)
+	mxs_reg_32(hw_usbphy_status)
+	mxs_reg_32(hw_usbphy_debug)
+	mxs_reg_32(hw_usbphy_debug0_status)
+	mxs_reg_32(hw_usbphy_debug1)
+	mxs_reg_32(hw_usbphy_version)
+	mxs_reg_32(hw_usbphy_ip)
 };
 
 #define	USBPHY_PWD_RXPWDRX				(1 << 20)
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index e701c64..7337458 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -23,11 +23,11 @@
 #ifndef __MX28_H__
 #define __MX28_H__
 
-int mx28_reset_block(struct mx28_register_32 *reg);
-int mx28_wait_mask_set(struct mx28_register_32 *reg,
+int mx28_reset_block(struct mxs_register_32 *reg);
+int mx28_wait_mask_set(struct mxs_register_32 *reg,
 		       uint32_t mask,
 		       int timeout);
-int mx28_wait_mask_clr(struct mx28_register_32 *reg,
+int mx28_wait_mask_clr(struct mxs_register_32 *reg,
 		       uint32_t mask,
 		       int timeout);
 
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 38dbc81..29f19ba 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -73,8 +73,8 @@ int gpio_get_value(unsigned gpio)
 {
 	uint32_t bank = PAD_BANK(gpio);
 	uint32_t offset = PINCTRL_DIN(bank);
-	struct mx28_register_32 *reg =
-		(struct mx28_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg =
+		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
 	return (readl(&reg->reg) >> PAD_PIN(gpio)) & 1;
 }
@@ -83,8 +83,8 @@ void gpio_set_value(unsigned gpio, int value)
 {
 	uint32_t bank = PAD_BANK(gpio);
 	uint32_t offset = PINCTRL_DOUT(bank);
-	struct mx28_register_32 *reg =
-		(struct mx28_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg =
+		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
 	if (value)
 		writel(1 << PAD_PIN(gpio), &reg->reg_set);
@@ -96,8 +96,8 @@ int gpio_direction_input(unsigned gpio)
 {
 	uint32_t bank = PAD_BANK(gpio);
 	uint32_t offset = PINCTRL_DOE(bank);
-	struct mx28_register_32 *reg =
-		(struct mx28_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg =
+		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
 	writel(1 << PAD_PIN(gpio), &reg->reg_clr);
 
@@ -108,8 +108,8 @@ int gpio_direction_output(unsigned gpio, int value)
 {
 	uint32_t bank = PAD_BANK(gpio);
 	uint32_t offset = PINCTRL_DOE(bank);
-	struct mx28_register_32 *reg =
-		(struct mx28_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg =
+		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
 	writel(1 << PAD_PIN(gpio), &reg->reg_set);
 
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index e1bd37e..f32df51 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -75,8 +75,8 @@ int ehci_hcd_init(void)
 
 	int ret;
 	uint32_t usb_base, cap_base;
-	struct mx28_register_32 *digctl_ctrl =
-		(struct mx28_register_32 *)HW_DIGCTL_CTRL;
+	struct mxs_register_32 *digctl_ctrl =
+		(struct mxs_register_32 *)HW_DIGCTL_CTRL;
 	struct mx28_clkctrl_regs *clkctrl_regs =
 		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
 
@@ -119,8 +119,8 @@ int ehci_hcd_stop(void)
 {
 	int ret;
 	uint32_t tmp;
-	struct mx28_register_32 *digctl_ctrl =
-		(struct mx28_register_32 *)HW_DIGCTL_CTRL;
+	struct mxs_register_32 *digctl_ctrl =
+		(struct mxs_register_32 *)HW_DIGCTL_CTRL;
 	struct mx28_clkctrl_regs *clkctrl_regs =
 		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
 
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt
  2012-05-12 23:40 ` [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt Otavio Salvador
@ 2012-05-13 17:11   ` Marek Vasut
  2012-05-29 20:41   ` Wolfgang Denk
  1 sibling, 0 replies; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 17:11 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  include/configs/m28evk.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index 7472ddc..ebf7e39 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -114,7 +114,7 @@
>   * U-Boot general configurations
>   */
>  #define	CONFIG_SYS_LONGHELP
> -#define	CONFIG_SYS_PROMPT	"=> "
> +#define	CONFIG_SYS_PROMPT	"M28EVK U-Boot => "

NAK, we want that "=> " prompt there. It'd be preferable if all boards used 
plain "=> " prompt actually.

>  #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O buffer 
size */
>  #define	CONFIG_SYS_PBSIZE	\
>  	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-12 23:40 ` [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Otavio Salvador
@ 2012-05-13 17:12   ` Marek Vasut
  2012-05-13 18:19     ` Otavio Salvador
  2012-05-29 20:44   ` Wolfgang Denk
  1 sibling, 1 reply; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 17:12 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

I don't like that "ought" in the subject ... did you actually try?

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name
  2012-05-12 23:40 ` [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name Otavio Salvador
@ 2012-05-13 17:12   ` Marek Vasut
  2012-05-13 18:46     ` Wolfgang Denk
  2012-06-13  9:07   ` Stefano Babic
  1 sibling, 1 reply; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 17:12 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  include/configs/m28evk.h |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index ebf7e39..c1ae996 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -17,8 +17,8 @@
>   * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>   * MA 02111-1307 USA
>   */
> -#ifndef __M28_H__
> -#define __M28_H__
> +#ifndef __M28EVK_CONFIG_H__
> +#define __M28EVK_CONFIG_H__

The module itself is called "m28", but this change is ok with me. WD?

> 
>  #include <asm/arch/regs-base.h>
> 
> @@ -327,4 +327,4 @@
>  		"fi ; "							\
>  		"fi\0"
> 
> -#endif /* __M28_H__ */
> +#endif /* __M28EVK_CONFIG_H__ */

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-12 23:40 ` [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix Otavio Salvador
@ 2012-05-13 17:15   ` Marek Vasut
  2012-05-13 18:23     ` Otavio Salvador
  2012-05-14 18:48   ` Otavio Salvador
  1 sibling, 1 reply; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 17:15 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> As the register accessing mode is the same for all i.MXS SoCs we ought
> to use 'mxs' prefix intead of 'mx28'.
> 

Are you _SURE_ the register offsets are the same on mx233 and mx28? For example 
for DMA?

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-13 17:12   ` Marek Vasut
@ 2012-05-13 18:19     ` Otavio Salvador
  0 siblings, 0 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-13 18:19 UTC (permalink / raw)
  To: u-boot

On Sun, May 13, 2012 at 2:12 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
> I don't like that "ought" in the subject ... did you actually try?

I didn't try it yet as I am in began of iMX23 suppport. I'll keep it
in my wip to resend after testing it.

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-13 17:15   ` Marek Vasut
@ 2012-05-13 18:23     ` Otavio Salvador
  2012-05-13 18:46       ` Marek Vasut
  0 siblings, 1 reply; 41+ messages in thread
From: Otavio Salvador @ 2012-05-13 18:23 UTC (permalink / raw)
  To: u-boot

On Sun, May 13, 2012 at 2:15 PM, Marek Vasut <marex@denx.de> wrote:
>> As the register accessing mode is the same for all i.MXS SoCs we ought
>> to use 'mxs' prefix intead of 'mx28'.
>>
>
> Are you _SURE_ the register offsets are the same on mx233 and mx28? For example
> for DMA?

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-13 18:23     ` Otavio Salvador
@ 2012-05-13 18:46       ` Marek Vasut
  2012-05-14 17:09         ` Otavio Salvador
  0 siblings, 1 reply; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 18:46 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> On Sun, May 13, 2012 at 2:15 PM, Marek Vasut <marex@denx.de> wrote:
> >> As the register accessing mode is the same for all i.MXS SoCs we ought
> >> to use 'mxs' prefix intead of 'mx28'.
> > 
> > Are you _SURE_ the register offsets are the same on mx233 and mx28? For
> > example for DMA?
> 
> From what I read from mx23 datasheet it is.

From what I saw two days ago in the LAKML it isn't ... compare HW_APBH_CH0_SEMA 
for instance ;-) Check drivers/dma/mxs-dma.c in Linux for example.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name
  2012-05-13 17:12   ` Marek Vasut
@ 2012-05-13 18:46     ` Wolfgang Denk
  2012-05-13 18:53       ` Marek Vasut
  0 siblings, 1 reply; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-13 18:46 UTC (permalink / raw)
  To: u-boot

Dear Marek Vasut,

In message <201205131912.57149.marex@denx.de> you wrote:
> Dear Otavio Salvador,
> 
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> >  include/configs/m28evk.h |    6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> > index ebf7e39..c1ae996 100644
> > --- a/include/configs/m28evk.h
> > +++ b/include/configs/m28evk.h
> > @@ -17,8 +17,8 @@
> >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> >   * MA 02111-1307 USA
> >   */
> > -#ifndef __M28_H__
> > -#define __M28_H__
> > +#ifndef __M28EVK_CONFIG_H__
> > +#define __M28EVK_CONFIG_H__
> 
> The module itself is called "m28", but this change is ok with me. WD?

It's OK with me, too.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Why waste negative entropy on comments, when you could use the  same
entropy to create bugs instead?"                        - Steve Elias

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name
  2012-05-13 18:46     ` Wolfgang Denk
@ 2012-05-13 18:53       ` Marek Vasut
  0 siblings, 0 replies; 41+ messages in thread
From: Marek Vasut @ 2012-05-13 18:53 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

> Dear Marek Vasut,
> 
> In message <201205131912.57149.marex@denx.de> you wrote:
> > Dear Otavio Salvador,
> > 
> > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > > ---
> > > 
> > >  include/configs/m28evk.h |    6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> > > index ebf7e39..c1ae996 100644
> > > --- a/include/configs/m28evk.h
> > > +++ b/include/configs/m28evk.h
> > > @@ -17,8 +17,8 @@
> > > 
> > >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> > >   * MA 02111-1307 USA
> > >   */
> > > 
> > > -#ifndef __M28_H__
> > > -#define __M28_H__
> > > +#ifndef __M28EVK_CONFIG_H__
> > > +#define __M28EVK_CONFIG_H__
> > 
> > The module itself is called "m28", but this change is ok with me. WD?
> 
> It's OK with me, too.

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

> 
> Best regards,
> 
> Wolfgang Denk

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order
  2012-05-12 23:40 ` [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order Otavio Salvador
@ 2012-05-13 19:29   ` Fabio Estevam
  2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Fabio Estevam @ 2012-05-13 19:29 UTC (permalink / raw)
  To: u-boot

On Sat, May 12, 2012 at 8:40 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Acked-by: Fabio Estevam <fabio.estevam@freescale.com>

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 6/8] mx28evk: fix board config include guardian macro name
  2012-05-12 23:40 ` [U-Boot] [PATCH 6/8] mx28evk: " Otavio Salvador
@ 2012-05-13 19:31   ` Fabio Estevam
  2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Fabio Estevam @ 2012-05-13 19:31 UTC (permalink / raw)
  To: u-boot

On Sat, May 12, 2012 at 8:40 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> ?include/configs/mx28evk.h | ? ?6 +++---
> ?1 file changed, 3 insertions(+), 3 deletions(-)

Acked-by: Fabio Estevam <fabio.estevam@freescale.com

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-13 18:46       ` Marek Vasut
@ 2012-05-14 17:09         ` Otavio Salvador
  2012-05-14 18:25           ` Marek Vasut
  0 siblings, 1 reply; 41+ messages in thread
From: Otavio Salvador @ 2012-05-14 17:09 UTC (permalink / raw)
  To: u-boot

On Sun, May 13, 2012 at 3:46 PM, Marek Vasut <marex@denx.de> wrote:
>> From what I read from mx23 datasheet it is.
>
> From what I saw two days ago in the LAKML it isn't ... compare HW_APBH_CH0_SEMA
> for instance ;-) Check drivers/dma/mxs-dma.c in Linux for example.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-14 17:09         ` Otavio Salvador
@ 2012-05-14 18:25           ` Marek Vasut
  0 siblings, 0 replies; 41+ messages in thread
From: Marek Vasut @ 2012-05-14 18:25 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> On Sun, May 13, 2012 at 3:46 PM, Marek Vasut <marex@denx.de> wrote:
> >> From what I read from mx23 datasheet it is.
> > 
> > From what I saw two days ago in the LAKML it isn't ... compare
> > HW_APBH_CH0_SEMA for instance ;-) Check drivers/dma/mxs-dma.c in Linux
> > for example.
> 
> From what I see the offsets are different but overwall the way to
> access the data is the same. So it ought to be easy to handle.

So you need two sets of regs, you can't deliberately rename mx28 DMA regset to 
mxs regset ...

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-12 23:40 ` [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix Otavio Salvador
  2012-05-13 17:15   ` Marek Vasut
@ 2012-05-14 18:48   ` Otavio Salvador
  2012-05-15  4:14     ` Marek Vasut
  1 sibling, 1 reply; 41+ messages in thread
From: Otavio Salvador @ 2012-05-14 18:48 UTC (permalink / raw)
  To: u-boot

On Sat, May 12, 2012 at 8:40 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> +++ b/arch/arm/include/asm/arch-mxs/regs-apbh.h
> @@ -30,142 +30,142 @@

My idea is to have a regs-apbh-mx28.h and regs-apbh-mx23.h file. But
the macro is mxs_... as it has same structure for mx28 and mx23.

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix
  2012-05-14 18:48   ` Otavio Salvador
@ 2012-05-15  4:14     ` Marek Vasut
  0 siblings, 0 replies; 41+ messages in thread
From: Marek Vasut @ 2012-05-15  4:14 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

> On Sat, May 12, 2012 at 8:40 PM, Otavio Salvador
> 
> <otavio@ossystems.com.br> wrote:
> > +++ b/arch/arm/include/asm/arch-mxs/regs-apbh.h
> > @@ -30,142 +30,142 @@
> 
> My idea is to have a regs-apbh-mx28.h and regs-apbh-mx23.h file. But
> the macro is mxs_... as it has same structure for mx28 and mx23.

Squash it into one file, have two structures ... it's fine.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt
  2012-05-12 23:40 ` [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt Otavio Salvador
  2012-05-13 17:11   ` Marek Vasut
@ 2012-05-29 20:41   ` Wolfgang Denk
  1 sibling, 0 replies; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 20:41 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

In message <1336866018-614-3-git-send-email-otavio@ossystems.com.br> you wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  include/configs/m28evk.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index 7472ddc..ebf7e39 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -114,7 +114,7 @@
>   * U-Boot general configurations
>   */
>  #define	CONFIG_SYS_LONGHELP
> -#define	CONFIG_SYS_PROMPT	"=> "
> +#define	CONFIG_SYS_PROMPT	"M28EVK U-Boot => "
>  #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O buffer size */
>  #define	CONFIG_SYS_PBSIZE	\
>  	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)

NAK.

I really dislike these verbose prompts which serve no real use, but
make any scripting (like automatic regression tests) unnecessarily
complicated.

Please feel free to do this with your own boards, if you really,
really think you must do that.  But please do not mess with any other
boards.

Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Anything free is worth what you pay for it.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-12 23:40 ` [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Otavio Salvador
  2012-05-13 17:12   ` Marek Vasut
@ 2012-05-29 20:44   ` Wolfgang Denk
  2012-05-29 21:25     ` Otavio Salvador
  2012-05-30  5:49     ` Marek Vasut
  1 sibling, 2 replies; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 20:44 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

In message <1336866018-614-5-git-send-email-otavio@ossystems.com.br> you wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  tools/mxsboot.c |  110 +++++++++++++++++++++++++++----------------------------
>  1 file changed, 55 insertions(+), 55 deletions(-)
> 
> diff --git a/tools/mxsboot.c b/tools/mxsboot.c
> index 6c05aa4..9661a48 100644
> --- a/tools/mxsboot.c
> +++ b/tools/mxsboot.c
> @@ -1,5 +1,5 @@
>  /*
> - * Freescale i.MX28 image generator
> + * Freescale i.MXS image generator

I'm unhappy about the name "i.MXS".  Either we say "i.MX28" - then
it's clear we mean a specific FSL SoC, identified by it's product
name.  Or we say "mxs" like allover the place in the Linux and U-Boot
code.

But I haven't seen "i.MXS" used before, and to me it makes no sense as
it mixes unrelated name spaces.

Please either use the Freescale name(s), or use "mxs".

Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Copy from one, it's plagiarism; copy from two, it's research.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack
  2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
@ 2012-05-29 20:44   ` Wolfgang Denk
  2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 20:44 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

In message <1336866018-614-2-git-send-email-otavio@ossystems.com.br> you wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  include/configs/m28evk.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Wolfgang Denk <wd@denx.de>

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Hacking's just another word for nothing left to kludge.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC
  2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
                   ` (7 preceding siblings ...)
  2012-05-12 23:40 ` [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix Otavio Salvador
@ 2012-05-29 20:47 ` Wolfgang Denk
  2012-05-29 20:58   ` Otavio Salvador
  8 siblings, 1 reply; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 20:47 UTC (permalink / raw)
  To: u-boot

Dear Otavio Salvador,

In message <1336866018-614-1-git-send-email-otavio@ossystems.com.br> you wrote:
> This patchset include some small fixes found while looking at code to
> start converting it to use a common mxs SoC code in preparation for
> inclusion of i.MX23 support.
> 
> Otavio Salvador (8):
>   m28evk: use same notation to alloc the 128kB stack
>   m28evk: use "M28EVK U-Boot =>" as prompt
>   mx28evk: ensure command definition is in alphabetic order
>   mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS
>     SoCs
>   m28evk: fix board config include guardian macro name
>   mx28evk: fix board config include guardian macro name
>   mxs: reorganize source directory for easy sharing of code in i.MXS
>     SoCs
>   mxs: prefix register acessor macros with 'mxs' prefix

I think I have seen this patch list before.

So is this an update dversion that obsoletes older submissions?  If
so, why is there no indication like a "[PATCH v2]" in the subjec
tline?  WHy are there no change logs in any of the patches?

Please see
http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions
and make sure to provide all these mandatory parts with your
submissions.

Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If all the Chinese simultaneously jumped into the Pacific  off  a  10
foot platform erected 10 feet off their coast, it would cause a tidal
wave that would destroy everything in this country west of Nebraska.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC
  2012-05-29 20:47 ` [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Wolfgang Denk
@ 2012-05-29 20:58   ` Otavio Salvador
  0 siblings, 0 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-29 20:58 UTC (permalink / raw)
  To: u-boot

On Tue, May 29, 2012 at 5:47 PM, Wolfgang Denk <wd@denx.de> wrote:

> So is this an update dversion that obsoletes older submissions?  If
> so, why is there no indication like a "[PATCH v2]" in the subjec
> tline?  WHy are there no change logs in any of the patches?
>

Yes; I sent it two times.

I have some work being done for MX23 and once it is ready I will post it
again. You can ignore the big patches for now.

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-29 20:44   ` Wolfgang Denk
@ 2012-05-29 21:25     ` Otavio Salvador
  2012-05-29 21:32       ` Wolfgang Denk
  2012-05-30  5:49     ` Marek Vasut
  1 sibling, 1 reply; 41+ messages in thread
From: Otavio Salvador @ 2012-05-29 21:25 UTC (permalink / raw)
  To: u-boot

On Tue, May 29, 2012 at 5:44 PM, Wolfgang Denk <wd@denx.de> wrote:

> >  /*
> > - * Freescale i.MX28 image generator
> > + * Freescale i.MXS image generator
>
> I'm unhappy about the name "i.MXS".  Either we say "i.MX28" - then
> it's clear we mean a specific FSL SoC, identified by it's product
> name.  Or we say "mxs" like allover the place in the Linux and U-Boot
> code.
>
> But I haven't seen "i.MXS" used before, and to me it makes no sense as
> it mixes unrelated name spaces.
>
> Please either use the Freescale name(s), or use "mxs".
>

http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MXS

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-29 21:25     ` Otavio Salvador
@ 2012-05-29 21:32       ` Wolfgang Denk
  2012-05-29 21:53         ` Otavio Salvador
  0 siblings, 1 reply; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 21:32 UTC (permalink / raw)
  To: u-boot

Dear Otavio,

In message <CAP9ODKoA--EB3EsRP-OrFJ191fTOZvE-gFYCZrULkEtdC=3yYg@mail.gmail.com> you wrote:
>
> > But I haven't seen "i.MXS" used before, and to me it makes no sense as
> > it mixes unrelated name spaces.
> >
> > Please either use the Freescale name(s), or use "mxs".
> 
> http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MXS

It seems you are supporting my argument?  Because the "i.MXS" I see
documented there appears to have very little in common with, for
example, i.MX28: "The processor features an ARM920T? core operating at
100 MHz"... ?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Drawing on my fine command of language, I said nothing.

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-29 21:32       ` Wolfgang Denk
@ 2012-05-29 21:53         ` Otavio Salvador
  0 siblings, 0 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-29 21:53 UTC (permalink / raw)
  To: u-boot

On Tue, May 29, 2012 at 6:32 PM, Wolfgang Denk <wd@denx.de> wrote:

> Dear Otavio,
>
> In message <CAP9ODKoA--EB3EsRP-OrFJ191fTOZvE-gFYCZrULkEtdC=
> 3yYg at mail.gmail.com> you wrote:
> >
> > > But I haven't seen "i.MXS" used before, and to me it makes no sense as
> > > it mixes unrelated name spaces.
> > >
> > > Please either use the Freescale name(s), or use "mxs".
> >
> > http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MXS
>
> It seems you are supporting my argument?  Because the "i.MXS" I see
> documented there appears to have very little in common with, for
> example, i.MX28: "The processor features an ARM920T? core operating at
> 100 MHz"... ?


I was not; I didn't notice it wasn't the same famity.

I will change the patch and post it again later.

Please archive this patch.

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-29 20:44   ` Wolfgang Denk
  2012-05-29 21:25     ` Otavio Salvador
@ 2012-05-30  5:49     ` Marek Vasut
  2012-05-30 12:01       ` Otavio Salvador
  2012-06-02  7:06       ` [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs) Dirk Behme
  1 sibling, 2 replies; 41+ messages in thread
From: Marek Vasut @ 2012-05-30  5:49 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

> Dear Otavio Salvador,
> 
> In message <1336866018-614-5-git-send-email-otavio@ossystems.com.br> you 
wrote:
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> > 
> >  tools/mxsboot.c |  110
> >  +++++++++++++++++++++++++++---------------------------- 1 file changed,
> >  55 insertions(+), 55 deletions(-)
> > 
> > diff --git a/tools/mxsboot.c b/tools/mxsboot.c
> > index 6c05aa4..9661a48 100644
> > --- a/tools/mxsboot.c
> > +++ b/tools/mxsboot.c
> > @@ -1,5 +1,5 @@
> > 
> >  /*
> > 
> > - * Freescale i.MX28 image generator
> > + * Freescale i.MXS image generator
> 
> I'm unhappy about the name "i.MXS".

I'm unhappy about the image generator ;-)

Ok, now Otavio will probably hate me, but I believe it'd be much more helpful to 
convert mxsboot into part of mkimage (though this is unrelated to this patch). 
And maybe even better, study the generation of boot headers and compare it with 
mx53/mx6q ones, as mx53 ones are supported by imximage and mx28 carries direct 
predecessor of mx53 bootrom and then try to implement support into imximage part 
of mkimage.

> Either we say "i.MX28" - then
> it's clear we mean a specific FSL SoC, identified by it's product
> name.  Or we say "mxs" like allover the place in the Linux and U-Boot
> code.

Well, we can also say i.mx233/i.mx28 . MX6Q is supported by mkimage I think (see 
above).

> But I haven't seen "i.MXS" used before, and to me it makes no sense as
> it mixes unrelated name spaces.
> 
> Please either use the Freescale name(s), or use "mxs".
> 
> Thanks.
> 
> Best regards,
> 
> Wolfgang Denk

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
  2012-05-30  5:49     ` Marek Vasut
@ 2012-05-30 12:01       ` Otavio Salvador
  2012-06-02  7:06       ` [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs) Dirk Behme
  1 sibling, 0 replies; 41+ messages in thread
From: Otavio Salvador @ 2012-05-30 12:01 UTC (permalink / raw)
  To: u-boot

Dear Marek Vasut,

On Wed, May 30, 2012 at 2:49 AM, Marek Vasut <marex@denx.de> wrote:

> I'm unhappy about the image generator ;-)
>
> Ok, now Otavio will probably hate me, but I believe it'd be much more
> helpful to
> convert mxsboot into part of mkimage (though this is unrelated to this
> patch).
> And maybe even better, study the generation of boot headers and compare it
> with
> mx53/mx6q ones, as mx53 ones are supported by imximage and mx28 carries
> direct
> predecessor of mx53 bootrom and then try to implement support into
> imximage part
> of mkimage.
>

I agree and it would be better to get rid of it however I also think we
ought to focus on finishing the i.MX233 support now before start changing
it.


> > Either we say "i.MX28" - then
> > it's clear we mean a specific FSL SoC, identified by it's product
> > name.  Or we say "mxs" like allover the place in the Linux and U-Boot
> > code.
>
> Well, we can also say i.mx233/i.mx28 . MX6Q is supported by mkimage I
> think (see
> above).


I have done this change here and queued it for the next pull request. I use
MXS on some places and the i.MX233/i.MX28 on the usage message.

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

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs)
  2012-05-30  5:49     ` Marek Vasut
  2012-05-30 12:01       ` Otavio Salvador
@ 2012-06-02  7:06       ` Dirk Behme
  2012-06-02  7:21         ` Marek Vasut
  1 sibling, 1 reply; 41+ messages in thread
From: Dirk Behme @ 2012-06-02  7:06 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On 30.05.2012 07:49, Marek Vasut wrote:
> Dear Wolfgang Denk,
>
>> Dear Otavio Salvador,
>>
>> In message<1336866018-614-5-git-send-email-otavio@ossystems.com.br>  you
> wrote:
>>> Signed-off-by: Otavio Salvador<otavio@ossystems.com.br>
>>> ---
>>>
>>>   tools/mxsboot.c |  110
>>>   +++++++++++++++++++++++++++---------------------------- 1 file changed,
>>>   55 insertions(+), 55 deletions(-)
>>>
>>> diff --git a/tools/mxsboot.c b/tools/mxsboot.c
>>> index 6c05aa4..9661a48 100644
>>> --- a/tools/mxsboot.c
>>> +++ b/tools/mxsboot.c
>>> @@ -1,5 +1,5 @@
>>>
>>>   /*
>>>
>>> - * Freescale i.MX28 image generator
>>> + * Freescale i.MXS image generator
>>
>> I'm unhappy about the name "i.MXS".
>
> I'm unhappy about the image generator ;-)
>
> Ok, now Otavio will probably hate me, but I believe it'd be much more helpful to
> convert mxsboot into part of mkimage (though this is unrelated to this patch).
> And maybe even better, study the generation of boot headers and compare it with
> mx53/mx6q ones, as mx53 ones are supported by imximage and mx28 carries direct
> predecessor of mx53 bootrom and then try to implement support into imximage part
> of mkimage.

I wasn't aware of mxsboot before this thread, so I start looking at 
it. I'm no expert of mx28 nor how the boot ROMs handle the NAND. 
Therefore some comments and questions:

Looking at

http://git.denx.de/?p=u-boot.git;a=blob;f=tools/mxsboot.c;h=6c05aa479d4360c0c14cd0f989c250ecf119126d;hb=HEAD#l453

mxsboot seem to support NAND and SD. Looking at the options given 
there, yes it sounds like a good idea to move that to imximage.


One question regarding the NAND handling, though:

Is mxsboot assumed to replace the Freescale tool 'kobs-ng'

http://imxcommunity.org/forum/topics/i-mx6-nand-boot?commentId=4103961%3AComment%3A69314&xg_source=activity

?

It was my understanding that for the NAND the bad sector table is 
necessary to be able to write a bootable image to the NAND? And this 
can be done only on the target? While mxsboot runs on the host? So 
it's not sufficient to give mxsboot the page/OOB/erase size options 
because the bad sector table is individual for each board/NAND chip?

Best regards

Dirk

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs)
  2012-06-02  7:06       ` [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs) Dirk Behme
@ 2012-06-02  7:21         ` Marek Vasut
  0 siblings, 0 replies; 41+ messages in thread
From: Marek Vasut @ 2012-06-02  7:21 UTC (permalink / raw)
  To: u-boot

Dear Dirk Behme,

> Hi Marek,
> 
> On 30.05.2012 07:49, Marek Vasut wrote:
> > Dear Wolfgang Denk,
> > 
> >> Dear Otavio Salvador,
> >> 
> >> In message<1336866018-614-5-git-send-email-otavio@ossystems.com.br>  you
> > 
> > wrote:
> >>> Signed-off-by: Otavio Salvador<otavio@ossystems.com.br>
> >>> ---
> >>> 
> >>>   tools/mxsboot.c |  110
> >>>   +++++++++++++++++++++++++++---------------------------- 1 file
> >>>   changed, 55 insertions(+), 55 deletions(-)
> >>> 
> >>> diff --git a/tools/mxsboot.c b/tools/mxsboot.c
> >>> index 6c05aa4..9661a48 100644
> >>> --- a/tools/mxsboot.c
> >>> +++ b/tools/mxsboot.c
> >>> @@ -1,5 +1,5 @@
> >>> 
> >>>   /*
> >>> 
> >>> - * Freescale i.MX28 image generator
> >>> + * Freescale i.MXS image generator
> >> 
> >> I'm unhappy about the name "i.MXS".
> > 
> > I'm unhappy about the image generator ;-)
> > 
> > Ok, now Otavio will probably hate me, but I believe it'd be much more
> > helpful to convert mxsboot into part of mkimage (though this is
> > unrelated to this patch). And maybe even better, study the generation of
> > boot headers and compare it with mx53/mx6q ones, as mx53 ones are
> > supported by imximage and mx28 carries direct predecessor of mx53
> > bootrom and then try to implement support into imximage part of mkimage.
> 
> I wasn't aware of mxsboot before this thread, so I start looking at
> it. I'm no expert of mx28 nor how the boot ROMs handle the NAND.
> Therefore some comments and questions:
> 
> Looking at
> 
> http://git.denx.de/?p=u-boot.git;a=blob;f=tools/mxsboot.c;h=6c05aa479d4360c
> 0c14cd0f989c250ecf119126d;hb=HEAD#l453
> 
> mxsboot seem to support NAND and SD. Looking at the options given
> there, yes it sounds like a good idea to move that to imximage.

100%

> One question regarding the NAND handling, though:
> 
> Is mxsboot assumed to replace the Freescale tool 'kobs-ng'

I believe so. It generates the necessary NAND headers for NAND boot. You can 
then write the resulting image directly at the begining of the NAND.

> http://imxcommunity.org/forum/topics/i-mx6-nand-boot?commentId=4103961%3ACo
> mment%3A69314&xg_source=activity
> 
> ?
> 
> It was my understanding that for the NAND the bad sector table is
> necessary to be able to write a bootable image to the NAND? And this
> can be done only on the target?

You mean DBBT? From what I remember, the bad block handling is done with the BCH 
module and the first block is always OK anyway. Or it was somehow like that,  
but I might be wrong. The point is, mxsboot doesn't use DBBT.

> While mxsboot runs on the host? So
> it's not sufficient to give mxsboot the page/OOB/erase size options
> because the bad sector table is individual for each board/NAND chip?

I don't see why the bad sector table is needed at all as the BCH handles the 
ECC.

> Best regards
> 
> Dirk

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack
  2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
  2012-05-29 20:44   ` Wolfgang Denk
@ 2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Stefano Babic @ 2012-06-13  9:06 UTC (permalink / raw)
  To: u-boot

On 13/05/2012 01:40, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied to u-boot-imx, 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
=====================================================================

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order
  2012-05-12 23:40 ` [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order Otavio Salvador
  2012-05-13 19:29   ` Fabio Estevam
@ 2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Stefano Babic @ 2012-06-13  9:06 UTC (permalink / raw)
  To: u-boot

On 13/05/2012 01:40, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied to u-boot-imx, 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
=====================================================================

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 6/8] mx28evk: fix board config include guardian macro name
  2012-05-12 23:40 ` [U-Boot] [PATCH 6/8] mx28evk: " Otavio Salvador
  2012-05-13 19:31   ` Fabio Estevam
@ 2012-06-13  9:06   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Stefano Babic @ 2012-06-13  9:06 UTC (permalink / raw)
  To: u-boot

On 13/05/2012 01:40, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---


Applied to u-boot-imx, 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
=====================================================================

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name
  2012-05-12 23:40 ` [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name Otavio Salvador
  2012-05-13 17:12   ` Marek Vasut
@ 2012-06-13  9:07   ` Stefano Babic
  1 sibling, 0 replies; 41+ messages in thread
From: Stefano Babic @ 2012-06-13  9:07 UTC (permalink / raw)
  To: u-boot

On 13/05/2012 01:40, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  include/configs/m28evk.h |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index ebf7e39..c1ae996 100644

Applied to u-boot-imx, 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
=====================================================================

^ permalink raw reply	[flat|nested] 41+ messages in thread
* [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs
@ 2012-05-29 21:35 Wolfgang Denk
  0 siblings, 0 replies; 41+ messages in thread
From: Wolfgang Denk @ 2012-05-29 21:35 UTC (permalink / raw)
  To: u-boot

Dear Otavio,

I wrote:

> In message <CAP9ODKoA--EB3EsRP-OrFJ191fTOZvE-gFYCZrULkEtdC=3yYg@mail.gmail.com> you wrote:
> >
> > > But I haven't seen "i.MXS" used before, and to me it makes no sense as
> > > it mixes unrelated name spaces.
> > >
> > > Please either use the Freescale name(s), or use "mxs".
> > 
> > http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MXS
> 
> It seems you are supporting my argument?  Because the "i.MXS" I see
> documented there appears to have very little in common with, for
> example, i.MX28: "The processor features an ARM920T? core operating at
> 100 MHz"... ?

Or look at the "Parametrics" section: 

- Not Recommended for New Design
- No Longer Manufactured

"i.MXS" is definitely a bad choice of name for what you have in mind.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Honest error is to be pitied, not ridiculed.
                                       -- Philip Earl of Chesterfield

^ permalink raw reply	[flat|nested] 41+ messages in thread
end of thread, other threads:[~2012-06-13  9:07 UTC | newest]

Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-12 23:40 [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Otavio Salvador
2012-05-12 23:40 ` [U-Boot] [PATCH 1/8] m28evk: use same notation to alloc the 128kB stack Otavio Salvador
2012-05-29 20:44   ` Wolfgang Denk
2012-06-13  9:06   ` Stefano Babic
2012-05-12 23:40 ` [U-Boot] [PATCH 2/8] m28evk: use "M28EVK U-Boot =>" as prompt Otavio Salvador
2012-05-13 17:11   ` Marek Vasut
2012-05-29 20:41   ` Wolfgang Denk
2012-05-12 23:40 ` [U-Boot] [PATCH 3/8] mx28evk: ensure command definition is in alphabetic order Otavio Salvador
2012-05-13 19:29   ` Fabio Estevam
2012-06-13  9:06   ` Stefano Babic
2012-05-12 23:40 ` [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Otavio Salvador
2012-05-13 17:12   ` Marek Vasut
2012-05-13 18:19     ` Otavio Salvador
2012-05-29 20:44   ` Wolfgang Denk
2012-05-29 21:25     ` Otavio Salvador
2012-05-29 21:32       ` Wolfgang Denk
2012-05-29 21:53         ` Otavio Salvador
2012-05-30  5:49     ` Marek Vasut
2012-05-30 12:01       ` Otavio Salvador
2012-06-02  7:06       ` [U-Boot] mxsboot vs. imximage (was: Re: [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs) Dirk Behme
2012-06-02  7:21         ` Marek Vasut
2012-05-12 23:40 ` [U-Boot] [PATCH 5/8] m28evk: fix board config include guardian macro name Otavio Salvador
2012-05-13 17:12   ` Marek Vasut
2012-05-13 18:46     ` Wolfgang Denk
2012-05-13 18:53       ` Marek Vasut
2012-06-13  9:07   ` Stefano Babic
2012-05-12 23:40 ` [U-Boot] [PATCH 6/8] mx28evk: " Otavio Salvador
2012-05-13 19:31   ` Fabio Estevam
2012-06-13  9:06   ` Stefano Babic
2012-05-12 23:40 ` [U-Boot] [PATCH 7/8] mxs: reorganize source directory for easy sharing of code in i.MXS SoCs Otavio Salvador
2012-05-12 23:40 ` [U-Boot] [PATCH 8/8] mxs: prefix register acessor macros with 'mxs' prefix Otavio Salvador
2012-05-13 17:15   ` Marek Vasut
2012-05-13 18:23     ` Otavio Salvador
2012-05-13 18:46       ` Marek Vasut
2012-05-14 17:09         ` Otavio Salvador
2012-05-14 18:25           ` Marek Vasut
2012-05-14 18:48   ` Otavio Salvador
2012-05-15  4:14     ` Marek Vasut
2012-05-29 20:47 ` [U-Boot] [PATCH 0/8] Minor fixes and start of consolidation onto mxs SoC Wolfgang Denk
2012-05-29 20:58   ` Otavio Salvador
2012-05-29 21:35 [U-Boot] [PATCH 4/8] mxsboot: stop referring to i.MX28 as this ought to work for all i.MXS SoCs Wolfgang Denk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.