summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Riesch <christian.riesch@omicron.at>2011-11-19 00:45:44 +0000
committerWolfgang Denk <wd@denx.de>2011-11-29 15:43:40 +0100
commit581a811c3fefd771f0eedb7af3b60ac86518a56b (patch)
tree9545a69626e574244c96eeb4c5918665b046be2d
parenteccb213e9da75a181cd2baac16ab3deda42e2796 (diff)
downloadu-boot-imx-581a811c3fefd771f0eedb7af3b60ac86518a56b.zip
u-boot-imx-581a811c3fefd771f0eedb7af3b60ac86518a56b.tar.gz
u-boot-imx-581a811c3fefd771f0eedb7af3b60ac86518a56b.tar.bz2
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
This patch replaces the HAWKBOARD_KICK{0,1}_UNLOCK defines by DV_SYSCFG_KICK{0,1}_UNLOCK. The kick register values are not hawkboard specific but may be used for all davinci boards. In commit f3c149d6c6e5ba8dd72baa86fe527837e4fb0e9a new defines for these values wer introduced. Signed-off-by: Christian Riesch <christian.riesch@omicron.at> Cc: Syed Mohammed Khasim <sm.khasim@gmail.com> Cc: Sughosh Ganu <urwithsughosh@gmail.com> Cc: Sandeep Paulraj <s-paulraj@ti.com>
-rw-r--r--arch/arm/include/asm/arch-davinci/davinci_misc.h3
-rw-r--r--board/davinci/da8xxevm/hawkboard.c4
-rw-r--r--board/davinci/da8xxevm/hawkboard_nand_spl.c4
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/include/asm/arch-davinci/davinci_misc.h b/arch/arm/include/asm/arch-davinci/davinci_misc.h
index 211b769..cbac803 100644
--- a/arch/arm/include/asm/arch-davinci/davinci_misc.h
+++ b/arch/arm/include/asm/arch-davinci/davinci_misc.h
@@ -45,9 +45,6 @@ struct pinmux_resource {
.n_pins = ARRAY_SIZE(item) \
}
-#define HAWKBOARD_KICK0_UNLOCK 0x83e70b13
-#define HAWKBOARD_KICK1_UNLOCK 0x95a4f1e0
-
struct lpsc_resource {
const int lpsc_no;
};
diff --git a/board/davinci/da8xxevm/hawkboard.c b/board/davinci/da8xxevm/hawkboard.c
index f34830e..9d4e238 100644
--- a/board/davinci/da8xxevm/hawkboard.c
+++ b/board/davinci/da8xxevm/hawkboard.c
@@ -47,8 +47,8 @@ int board_early_init_f(void)
/*
* Kick Registers need to be set to allow access to Pin Mux registers
*/
- writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
- writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+ writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+ writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
/* set cfgchip3 to select mii */
writel(readl(&davinci_syscfg_regs->cfgchip3) &
diff --git a/board/davinci/da8xxevm/hawkboard_nand_spl.c b/board/davinci/da8xxevm/hawkboard_nand_spl.c
index e5e65e5..32b17ce 100644
--- a/board/davinci/da8xxevm/hawkboard_nand_spl.c
+++ b/board/davinci/da8xxevm/hawkboard_nand_spl.c
@@ -99,8 +99,8 @@ void board_init_f(ulong bootflag)
/*
* Kick Registers need to be set to allow access to Pin Mux registers
*/
- writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
- writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+ writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+ writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
/* setup the SUSPSRC for ARM to control emulation suspend */
writel(readl(&davinci_syscfg_regs->suspsrc) &