[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[robert at delien.nl]

From: Robert Delien <robert@delien.nl>

This patch eliminates the use of magic numbers for the scratch register
addresses. The registers in the DIGCTL sections are now defined and
used to access the scratch registers.

Robert Delien (2):
  Added register definitions for DIGCTL registers
  Replaced magic numbers for scratch register addresses with register
    definitions

 arch/arm/cpu/arm926ejs/mx28/mx28.c           |    8 +-
 arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c   |    8 +-
 arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
 arch/arm/include/asm/arch-mx28/regs-digctl.h |  155 ++++++++++++++++++++++++++
 4 files changed, 164 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h

[U-Boot] [PATCH 1/2] i.mx28: Added register definitions for DIGCTL registers

[robert at delien.nl]

From: Robert Delien <robert@delien.nl>

This patch adds register definitions for the registers of the DIGCTL
IP-block.

Signed-off-by: Robert Delien <robert@delien.nl>
---
 arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
 arch/arm/include/asm/arch-mx28/regs-digctl.h |  155 ++++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h

diff --git a/arch/arm/include/asm/arch-mx28/imx-regs.h b/arch/arm/include/asm/arch-mx28/imx-regs.h
index 9561b5e..f9e6c53 100644
--- a/arch/arm/include/asm/arch-mx28/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx28/imx-regs.h
@@ -27,6 +27,7 @@
 #include <asm/arch/regs-base.h>
 #include <asm/arch/regs-bch.h>
 #include <asm/arch/regs-clkctrl.h>
+#include <asm/arch/regs-digctl.h>
 #include <asm/arch/regs-gpmi.h>
 #include <asm/arch/regs-i2c.h>
 #include <asm/arch/regs-ocotp.h>
diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h b/arch/arm/include/asm/arch-mx28/regs-digctl.h
new file mode 100644
index 0000000..9a63594
--- /dev/null
+++ b/arch/arm/include/asm/arch-mx28/regs-digctl.h
@@ -0,0 +1,155 @@
+/*
+ * Freescale i.MX28 DIGCTL Register Definitions
+ *
+ * Copyright (C) 2012 Robert Delien <robert@delien.nl>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#ifndef __MX28_REGS_DIGCTL_H__
+#define __MX28_REGS_DIGCTL_H__
+
+#include <asm/arch/regs-common.h>
+
+#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 */
+	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 */
+	uint32_t	hw_digctl_entropy;			/* 0x090 */
+	uint32_t	reserved_entropy[3];
+	uint32_t	hw_digctl_entropy_latched;		/* 0x0a0 */
+	uint32_t	reserved_entropy_latched[3];
+
+	uint32_t	reserved1[4];
+
+	mx28_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 */
+	uint32_t	reserved_hw_digctl_dbg[3];
+
+	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 */
+
+	uint32_t	reserved3[36];
+
+	uint32_t	hw_digctl_scratch0;			/* 0x280 */
+	uint32_t	reserved_hw_digctl_scratch0[3];
+	uint32_t	hw_digctl_scratch1;			/* 0x290 */
+	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 */
+	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 */
+	uint32_t	reserved_hw_digctl_debug_trap_l0_addr_high[3];
+	uint32_t	hw_digctl_debug_trap_l3_addr_low;	/* 0x2e0 */
+	uint32_t	reserved_hw_digctl_debug_trap_l3_addr_low[3];
+	uint32_t	hw_digctl_debug_trap_l3_addr_high;	/* 0x2f0 */
+	uint32_t	reserved_hw_digctl_debug_trap_l3_addr_high[3];
+	uint32_t	hw_digctl_fsl;				/* 0x300 */
+	uint32_t	reserved_hw_digctl_fsl[3];
+	uint32_t	hw_digctl_chipid;			/* 0x310 */
+	uint32_t	reserved_hw_digctl_chipid[3];
+
+	uint32_t	reserved4[4];
+
+	uint32_t	hw_digctl_ahb_stats_select;		/* 0x330 */
+	uint32_t	reserved_hw_digctl_ahb_stats_select[3];
+
+	uint32_t	reserved5[12];
+
+	uint32_t	hw_digctl_l1_ahb_active_cycles;		/* 0x370 */
+	uint32_t	reserved_hw_digctl_l1_ahb_active_cycles[3];
+	uint32_t	hw_digctl_l1_ahb_data_stalled;		/* 0x380 */
+	uint32_t	reserved_hw_digctl_l1_ahb_data_stalled[3];
+	uint32_t	hw_digctl_l1_ahb_data_cycles;		/* 0x390 */
+	uint32_t	reserved_hw_digctl_l1_ahb_data_cycles[3];
+	uint32_t	hw_digctl_l2_ahb_active_cycles;		/* 0x3a0 */
+	uint32_t	reserved_hw_digctl_l2_ahb_active_cycles[3];
+	uint32_t	hw_digctl_l2_ahb_data_stalled;		/* 0x3b0 */
+	uint32_t	reserved_hw_digctl_l2_ahb_data_stalled[3];
+	uint32_t	hw_digctl_l2_ahb_data_cycles;		/* 0x3c0 */
+	uint32_t	reserved_hw_digctl_l2_ahb_data_cycles[3];
+	uint32_t	hw_digctl_l3_ahb_active_cycles;		/* 0x3d0 */
+	uint32_t	reserved_hw_digctl_l3_ahb_active_cycles[3];
+	uint32_t	hw_digctl_l3_ahb_data_stalled;		/* 0x3e0 */
+	uint32_t	reserved_hw_digctl_l3_ahb_data_stalled[3];
+	uint32_t	hw_digctl_l3_ahb_data_cycles;		/* 0x3f0 */
+	uint32_t	reserved_hw_digctl_l3_ahb_data_cycles[3];
+
+	uint32_t	reserved6[64];
+
+	uint32_t	hw_digctl_mpte0_loc;			/* 0x500 */
+	uint32_t	reserved_hw_digctl_mpte0_loc[3];
+	uint32_t	hw_digctl_mpte1_loc;			/* 0x510 */
+	uint32_t	reserved_hw_digctl_mpte1_loc[3];
+	uint32_t	hw_digctl_mpte2_loc;			/* 0x520 */
+	uint32_t	reserved_hw_digctl_mpte2_loc[3];
+	uint32_t	hw_digctl_mpte3_loc;			/* 0x530 */
+	uint32_t	reserved_hw_digctl_mpte3_loc[3];
+	uint32_t	hw_digctl_mpte4_loc;			/* 0x540 */
+	uint32_t	reserved_hw_digctl_mpte4_loc[3];
+	uint32_t	hw_digctl_mpte5_loc;			/* 0x550 */
+	uint32_t	reserved_hw_digctl_mpte5_loc[3];
+	uint32_t	hw_digctl_mpte6_loc;			/* 0x560 */
+	uint32_t	reserved_hw_digctl_mpte6_loc[3];
+	uint32_t	hw_digctl_mpte7_loc;			/* 0x570 */
+	uint32_t	reserved_hw_digctl_mpte7_loc[3];
+	uint32_t	hw_digctl_mpte8_loc;			/* 0x580 */
+	uint32_t	reserved_hw_digctl_mpte8_loc[3];
+	uint32_t	hw_digctl_mpte9_loc;			/* 0x590 */
+	uint32_t	reserved_hw_digctl_mpte9_loc[3];
+	uint32_t	hw_digctl_mpte10_loc;			/* 0x5a0 */
+	uint32_t	reserved_hw_digctl_mpte10_loc[3];
+	uint32_t	hw_digctl_mpte11_loc;			/* 0x5b0 */
+	uint32_t	reserved_hw_digctl_mpte11_loc[3];
+	uint32_t	hw_digctl_mpte12_loc;			/* 0x5c0 */
+	uint32_t	reserved_hw_digctl_mpte12_loc[3];
+	uint32_t	hw_digctl_mpte13_loc;			/* 0x5d0 */
+	uint32_t	reserved_hw_digctl_mpte13_loc[3];
+	uint32_t	hw_digctl_mpte14_loc;			/* 0x5e0 */
+	uint32_t	reserved_hw_digctl_mpte14_loc[3];
+	uint32_t	hw_digctl_mpte15_loc;			/* 0x5f0 */
+	uint32_t	reserved_hw_digctl_mpte15_loc[3];
+};
+#endif
+
+#endif /* __MX28_REGS_DIGCTL_H__ */
-- 
1.7.0.4

[U-Boot] [PATCH 2/2] i.mx28: Replaced magic numbers for scratch register addresses with register definitions

[robert at delien.nl]

From: Robert Delien <robert@delien.nl>

This patch replaces the use of magice numbers for scratch register
addresses with earlier defined register definitions.

Signed-off-by: Robert Delien <robert@delien.nl>
---
 arch/arm/cpu/arm926ejs/mx28/mx28.c         |    8 ++++----
 arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index 0e69193..9bfd83b 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -261,14 +261,14 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 }
 #endif
 
-#define	HW_DIGCTRL_SCRATCH0	0x8001c280
-#define	HW_DIGCTRL_SCRATCH1	0x8001c290
 int mx28_dram_init(void)
 {
+	struct mx28_digctl_regs *digctl_regs =
+		(struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
 	uint32_t sz[2];
 
-	sz[0] = readl(HW_DIGCTRL_SCRATCH0);
-	sz[1] = readl(HW_DIGCTRL_SCRATCH1);
+	sz[0] = readl(&digctl_regs->hw_digctl_scratch0);
+	sz[1] = readl(&digctl_regs->hw_digctl_scratch1);
 
 	if (sz[0] != sz[1]) {
 		printf("MX28:\n"
diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
index cf4361c..30d8a60 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
@@ -159,8 +159,6 @@ void mx28_mem_setup_vddd(void)
 		&power_regs->hw_power_vdddctrl);
 }
 
-#define	HW_DIGCTRL_SCRATCH0	0x8001c280
-#define	HW_DIGCTRL_SCRATCH1	0x8001c290
 void data_abort_memdetect_handler(void) __attribute__((naked));
 void data_abort_memdetect_handler(void)
 {
@@ -169,6 +167,8 @@ void data_abort_memdetect_handler(void)
 
 void mx28_mem_get_size(void)
 {
+	struct mx28_digctl_regs *digctl_regs =
+		(struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
 	uint32_t sz, da;
 	uint32_t *vt = (uint32_t *)0x20;
 
@@ -177,8 +177,8 @@ void mx28_mem_get_size(void)
 	vt[4] = (uint32_t)&data_abort_memdetect_handler;
 
 	sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
-	writel(sz, HW_DIGCTRL_SCRATCH0);
-	writel(sz, HW_DIGCTRL_SCRATCH1);
+	writel(sz, &digctl_regs->hw_digctl_scratch0);
+	writel(sz, &digctl_regs->hw_digctl_scratch1);
 
 	/* Restore the old DABT handler. */
 	vt[4] = da;
-- 
1.7.0.4

[U-Boot] [PATCH 1/2] i.mx28: Added register definitions for DIGCTL registers

[Marek Vasut]

> From: Robert Delien <robert@delien.nl>
> 
> This patch adds register definitions for the registers of the DIGCTL
> IP-block.
> 
> Signed-off-by: Robert Delien <robert@delien.nl>
> ---
>  arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
>  arch/arm/include/asm/arch-mx28/regs-digctl.h |  155
> ++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0
> deletions(-)
>  create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h
> 
> diff --git a/arch/arm/include/asm/arch-mx28/imx-regs.h
> b/arch/arm/include/asm/arch-mx28/imx-regs.h index 9561b5e..f9e6c53 100644
> --- a/arch/arm/include/asm/arch-mx28/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx28/imx-regs.h
> @@ -27,6 +27,7 @@
>  #include <asm/arch/regs-base.h>
>  #include <asm/arch/regs-bch.h>
>  #include <asm/arch/regs-clkctrl.h>
> +#include <asm/arch/regs-digctl.h>
>  #include <asm/arch/regs-gpmi.h>
>  #include <asm/arch/regs-i2c.h>
>  #include <asm/arch/regs-ocotp.h>
> diff --git a/arch/arm/include/asm/arch-mx28/regs-digctl.h
> b/arch/arm/include/asm/arch-mx28/regs-digctl.h new file mode 100644
> index 0000000..9a63594
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-mx28/regs-digctl.h
> @@ -0,0 +1,155 @@
> +/*
> + * Freescale i.MX28 DIGCTL Register Definitions
> + *
> + * Copyright (C) 2012 Robert Delien <robert@delien.nl>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> USA + *
> + */
> +
> +#ifndef __MX28_REGS_DIGCTL_H__
> +#define __MX28_REGS_DIGCTL_H__
> +
> +#include <asm/arch/regs-common.h>
> +
> +#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 */
> +	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 */
> +	uint32_t	hw_digctl_entropy;			/* 0x090 */
> +	uint32_t	reserved_entropy[3];
> +	uint32_t	hw_digctl_entropy_latched;		/* 0x0a0 */
> +	uint32_t	reserved_entropy_latched[3];
> +
> +	uint32_t	reserved1[4];
> +
> +	mx28_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 */
> +	uint32_t	reserved_hw_digctl_dbg[3];
> +
> +	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 */
> +
> +	uint32_t	reserved3[36];
> +
> +	uint32_t	hw_digctl_scratch0;			/* 0x280 */
> +	uint32_t	reserved_hw_digctl_scratch0[3];
> +	uint32_t	hw_digctl_scratch1;			/* 0x290 */
> +	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 */
> +	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 */
> +	uint32_t	reserved_hw_digctl_debug_trap_l0_addr_high[3];
> +	uint32_t	hw_digctl_debug_trap_l3_addr_low;	/* 0x2e0 */
> +	uint32_t	reserved_hw_digctl_debug_trap_l3_addr_low[3];
> +	uint32_t	hw_digctl_debug_trap_l3_addr_high;	/* 0x2f0 */
> +	uint32_t	reserved_hw_digctl_debug_trap_l3_addr_high[3];
> +	uint32_t	hw_digctl_fsl;				/* 0x300 */
> +	uint32_t	reserved_hw_digctl_fsl[3];
> +	uint32_t	hw_digctl_chipid;			/* 0x310 */
> +	uint32_t	reserved_hw_digctl_chipid[3];
> +
> +	uint32_t	reserved4[4];
> +
> +	uint32_t	hw_digctl_ahb_stats_select;		/* 0x330 */
> +	uint32_t	reserved_hw_digctl_ahb_stats_select[3];
> +
> +	uint32_t	reserved5[12];
> +
> +	uint32_t	hw_digctl_l1_ahb_active_cycles;		/* 0x370 */
> +	uint32_t	reserved_hw_digctl_l1_ahb_active_cycles[3];
> +	uint32_t	hw_digctl_l1_ahb_data_stalled;		/* 0x380 */
> +	uint32_t	reserved_hw_digctl_l1_ahb_data_stalled[3];
> +	uint32_t	hw_digctl_l1_ahb_data_cycles;		/* 0x390 */
> +	uint32_t	reserved_hw_digctl_l1_ahb_data_cycles[3];
> +	uint32_t	hw_digctl_l2_ahb_active_cycles;		/* 0x3a0 */
> +	uint32_t	reserved_hw_digctl_l2_ahb_active_cycles[3];
> +	uint32_t	hw_digctl_l2_ahb_data_stalled;		/* 0x3b0 */
> +	uint32_t	reserved_hw_digctl_l2_ahb_data_stalled[3];
> +	uint32_t	hw_digctl_l2_ahb_data_cycles;		/* 0x3c0 */
> +	uint32_t	reserved_hw_digctl_l2_ahb_data_cycles[3];
> +	uint32_t	hw_digctl_l3_ahb_active_cycles;		/* 0x3d0 */
> +	uint32_t	reserved_hw_digctl_l3_ahb_active_cycles[3];
> +	uint32_t	hw_digctl_l3_ahb_data_stalled;		/* 0x3e0 */
> +	uint32_t	reserved_hw_digctl_l3_ahb_data_stalled[3];
> +	uint32_t	hw_digctl_l3_ahb_data_cycles;		/* 0x3f0 */
> +	uint32_t	reserved_hw_digctl_l3_ahb_data_cycles[3];
> +
> +	uint32_t	reserved6[64];
> +
> +	uint32_t	hw_digctl_mpte0_loc;			/* 0x500 */
> +	uint32_t	reserved_hw_digctl_mpte0_loc[3];
> +	uint32_t	hw_digctl_mpte1_loc;			/* 0x510 */
> +	uint32_t	reserved_hw_digctl_mpte1_loc[3];
> +	uint32_t	hw_digctl_mpte2_loc;			/* 0x520 */
> +	uint32_t	reserved_hw_digctl_mpte2_loc[3];
> +	uint32_t	hw_digctl_mpte3_loc;			/* 0x530 */
> +	uint32_t	reserved_hw_digctl_mpte3_loc[3];
> +	uint32_t	hw_digctl_mpte4_loc;			/* 0x540 */
> +	uint32_t	reserved_hw_digctl_mpte4_loc[3];
> +	uint32_t	hw_digctl_mpte5_loc;			/* 0x550 */
> +	uint32_t	reserved_hw_digctl_mpte5_loc[3];
> +	uint32_t	hw_digctl_mpte6_loc;			/* 0x560 */
> +	uint32_t	reserved_hw_digctl_mpte6_loc[3];
> +	uint32_t	hw_digctl_mpte7_loc;			/* 0x570 */
> +	uint32_t	reserved_hw_digctl_mpte7_loc[3];
> +	uint32_t	hw_digctl_mpte8_loc;			/* 0x580 */
> +	uint32_t	reserved_hw_digctl_mpte8_loc[3];
> +	uint32_t	hw_digctl_mpte9_loc;			/* 0x590 */
> +	uint32_t	reserved_hw_digctl_mpte9_loc[3];
> +	uint32_t	hw_digctl_mpte10_loc;			/* 0x5a0 */
> +	uint32_t	reserved_hw_digctl_mpte10_loc[3];
> +	uint32_t	hw_digctl_mpte11_loc;			/* 0x5b0 */
> +	uint32_t	reserved_hw_digctl_mpte11_loc[3];
> +	uint32_t	hw_digctl_mpte12_loc;			/* 0x5c0 */
> +	uint32_t	reserved_hw_digctl_mpte12_loc[3];
> +	uint32_t	hw_digctl_mpte13_loc;			/* 0x5d0 */
> +	uint32_t	reserved_hw_digctl_mpte13_loc[3];
> +	uint32_t	hw_digctl_mpte14_loc;			/* 0x5e0 */
> +	uint32_t	reserved_hw_digctl_mpte14_loc[3];
> +	uint32_t	hw_digctl_mpte15_loc;			/* 0x5f0 */
> +	uint32_t	reserved_hw_digctl_mpte15_loc[3];
> +};
> +#endif

Bit definitions for these registers are missing. I have a crappy script that 
converts original FSL files into u-boot variant (though it needs some handjob 
still).

> +
> +#endif /* __MX28_REGS_DIGCTL_H__ */

[U-Boot] [PATCH 2/2] i.mx28: Replaced magic numbers for scratch register addresses with register definitions

[Marek Vasut]

> From: Robert Delien <robert@delien.nl>
> 
> This patch replaces the use of magice numbers for scratch register
> addresses with earlier defined register definitions.
> 
> Signed-off-by: Robert Delien <robert@delien.nl>
> ---
>  arch/arm/cpu/arm926ejs/mx28/mx28.c         |    8 ++++----
>  arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c |    8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> b/arch/arm/cpu/arm926ejs/mx28/mx28.c index 0e69193..9bfd83b 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> @@ -261,14 +261,14 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char
> *mac) }
>  #endif
> 
> -#define	HW_DIGCTRL_SCRATCH0	0x8001c280
> -#define	HW_DIGCTRL_SCRATCH1	0x8001c290
>  int mx28_dram_init(void)
>  {
> +	struct mx28_digctl_regs *digctl_regs =
> +		(struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
>  	uint32_t sz[2];
> 
> -	sz[0] = readl(HW_DIGCTRL_SCRATCH0);
> -	sz[1] = readl(HW_DIGCTRL_SCRATCH1);
> +	sz[0] = readl(&digctl_regs->hw_digctl_scratch0);
> +	sz[1] = readl(&digctl_regs->hw_digctl_scratch1);
> 
>  	if (sz[0] != sz[1]) {
>  		printf("MX28:\n"
> diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
> b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c index cf4361c..30d8a60 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
> @@ -159,8 +159,6 @@ void mx28_mem_setup_vddd(void)
>  		&power_regs->hw_power_vdddctrl);
>  }
> 
> -#define	HW_DIGCTRL_SCRATCH0	0x8001c280
> -#define	HW_DIGCTRL_SCRATCH1	0x8001c290
>  void data_abort_memdetect_handler(void) __attribute__((naked));
>  void data_abort_memdetect_handler(void)
>  {
> @@ -169,6 +167,8 @@ void data_abort_memdetect_handler(void)
> 
>  void mx28_mem_get_size(void)
>  {
> +	struct mx28_digctl_regs *digctl_regs =
> +		(struct mx28_digctl_regs *)MXS_DIGCTL_BASE;
>  	uint32_t sz, da;
>  	uint32_t *vt = (uint32_t *)0x20;
> 
> @@ -177,8 +177,8 @@ void mx28_mem_get_size(void)
>  	vt[4] = (uint32_t)&data_abort_memdetect_handler;
> 
>  	sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
> -	writel(sz, HW_DIGCTRL_SCRATCH0);
> -	writel(sz, HW_DIGCTRL_SCRATCH1);
> +	writel(sz, &digctl_regs->hw_digctl_scratch0);
> +	writel(sz, &digctl_regs->hw_digctl_scratch1);
> 
>  	/* Restore the old DABT handler. */
>  	vt[4] = da;

This is good.

M

[U-Boot] [PATCH 1/2] i.mx28: Added register definitions for DIGCTL registers

[Robert Deliën]

> Bit definitions for these registers are missing. I have a crappy script that
> converts original FSL files into u-boot variant (though it needs some handjob
> still).

Bring it on, and I'll see if I can do it. No, this is not implying I'm good at hand-
jobs.
But please accept my patch in the mean time.

[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[Matthias Fuchs]

Marek, Stefano,

what kept you from accepting these patches? There was no objection on these.

Matthias

On 07.02.2012 15:08, robert at delien.nl wrote:
> From: Robert Delien <robert@delien.nl>
> 
> This patch eliminates the use of magic numbers for the scratch register
> addresses. The registers in the DIGCTL sections are now defined and
> used to access the scratch registers.
> 
> Robert Delien (2):
>   Added register definitions for DIGCTL registers
>   Replaced magic numbers for scratch register addresses with register
>     definitions
> 
>  arch/arm/cpu/arm926ejs/mx28/mx28.c           |    8 +-
>  arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c   |    8 +-
>  arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
>  arch/arm/include/asm/arch-mx28/regs-digctl.h |  155 ++++++++++++++++++++++++++
>  4 files changed, 164 insertions(+), 8 deletions(-)
>  create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
> 

[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[Marek Vasut]

> Marek, Stefano,
> 
> what kept you from accepting these patches? There was no objection on
> these.

The regs-digctl.h file being incomplete, it didn't contain all the bit 
definitions even though I shared the tool to convert file provided by FSL to 
uboot format.

M

> 
> Matthias
> 
> On 07.02.2012 15:08, robert at delien.nl wrote:
> > From: Robert Delien <robert@delien.nl>
> > 
> > This patch eliminates the use of magic numbers for the scratch register
> > addresses. The registers in the DIGCTL sections are now defined and
> > used to access the scratch registers.
> > 
> > Robert Delien (2):
> >   Added register definitions for DIGCTL registers
> >   Replaced magic numbers for scratch register addresses with register
> >   
> >     definitions
> >  
> >  arch/arm/cpu/arm926ejs/mx28/mx28.c           |    8 +-
> >  arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c   |    8 +-
> >  arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
> >  arch/arm/include/asm/arch-mx28/regs-digctl.h |  155
> >  ++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 8
> >  deletions(-)
> >  create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h
> > 
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot at lists.denx.de
> > http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[Matthias Fuchs]

On 20.02.2012 09:32, Marek Vasut wrote:
>> Marek, Stefano,
>>
>> what kept you from accepting these patches? There was no objection on
>> these.
> 
> The regs-digctl.h file being incomplete, it didn't contain all the bit 
> definitions even though I shared the tool to convert file provided by FSL to 
> uboot format.
Why must this file be absolute complete? It can be extended on need.
This just slows down development and as you might have noticed, that it
chases away some developers.

So accepting this patch is a first step. And hopefully the rest is added
sometimes later. If not, well, then nobody needs it and there's no need
to blow the headers.

Matthias


> 
> M
> 
>>
>> Matthias
>>
>> On 07.02.2012 15:08, robert at delien.nl wrote:
>>> From: Robert Delien <robert@delien.nl>
>>>
>>> This patch eliminates the use of magic numbers for the scratch register
>>> addresses. The registers in the DIGCTL sections are now defined and
>>> used to access the scratch registers.
>>>
>>> Robert Delien (2):
>>>   Added register definitions for DIGCTL registers
>>>   Replaced magic numbers for scratch register addresses with register
>>>   
>>>     definitions
>>>  
>>>  arch/arm/cpu/arm926ejs/mx28/mx28.c           |    8 +-
>>>  arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c   |    8 +-
>>>  arch/arm/include/asm/arch-mx28/imx-regs.h    |    1 +
>>>  arch/arm/include/asm/arch-mx28/regs-digctl.h |  155
>>>  ++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 8
>>>  deletions(-)
>>>  create mode 100644 arch/arm/include/asm/arch-mx28/regs-digctl.h
>>>
>>> _______________________________________________
>>> U-Boot mailing list
>>> U-Boot at lists.denx.de
>>> http://lists.denx.de/mailman/listinfo/u-boot
> 


-- 
------------------------------------------------------------------------
Dipl.-Ing. Matthias Fuchs
Head of System Design

esd electronic system design gmbh
Vahrenwalder Str. 207 - 30165 Hannover - GERMANY
Phone: +49-511-37298-0 - Fax: +49-511-37298-68
Please visit our homepage http://www.esd.eu
Quality Products - Made in Germany

Besuchen Sie uns auf der embedded world 2012
in Halle 4, Stand 129
vom 28. Februar - 01. M?rz 2012 in N?rnberg!
------------------------------------------------------------------------
Gesch?ftsf?hrer: Klaus Detering
Amtsgericht Hannover HRB 51373 - VAT-ID DE 115672832
-------------------------------------------------------------------------

[U-Boot] [PATCH 0/2] i.mx28: Elimintated magic numbers for scratch register addresses

[Stefano Babic]

On 20/02/2012 09:32, Marek Vasut wrote:
>> Marek, Stefano,
>>
>> what kept you from accepting these patches? There was no objection on
>> these.
> 
> The regs-digctl.h file being incomplete, it didn't contain all the bit 
> definitions even though I shared the tool to convert file provided by FSL to 
> uboot format.

My point: most of files in u-boot can be considered incomplete, because
they do not define everything, but only what is *currently* used in U-boot.

I have not merged this patch because in the thread I read Robert wanted
to send an updated patch, and this made this version automatically obsolete.

I agree we can merge this patch - and we can always push later a patch
adding the bit definitions, when it will be necessary.

Best Regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH 1/2] i.mx28: Added register definitions for DIGCTL registers

[Stefano Babic]

On 07/02/2012 15:08, robert at delien.nl wrote:
> From: Robert Delien <robert@delien.nl>
> 
> This patch adds register definitions for the registers of the DIGCTL
> IP-block.
> 
> Signed-off-by: Robert Delien <robert@delien.nl>

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-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH 2/2] i.mx28: Replaced magic numbers for scratch register addresses with register definitions

[Stefano Babic]

On 07/02/2012 15:08, robert at delien.nl wrote:
> From: Robert Delien <robert@delien.nl>
> 
> This patch replaces the use of magice numbers for scratch register
> addresses with earlier defined register definitions.
> 
> Signed-off-by: Robert Delien <robert@delien.nl>
> ---

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-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================