Message ID | 1321699544-2235-3-git-send-email-christian.riesch@omicron.at |
---|---|
State | Accepted |
Commit | e722d5d076539309e4dc6ff718a2d3ba0341a046 |
Delegated to: | Anatolij Gustschin |
Headers | show |
On Sat, 19 Nov 2011 11:45:44 +0100 Christian Riesch <christian.riesch@omicron.at> wrote: > 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> > --- > arch/arm/include/asm/arch-davinci/davinci_misc.h | 3 --- > board/davinci/da8xxevm/hawkboard.c | 4 ++-- > board/davinci/da8xxevm/hawkboard_nand_spl.c | 4 ++-- > 3 files changed, 4 insertions(+), 7 deletions(-) Applied to u-boot-staging agust@denx.de. Thanks! Anatolij
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) &
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> --- arch/arm/include/asm/arch-davinci/davinci_misc.h | 3 --- board/davinci/da8xxevm/hawkboard.c | 4 ++-- board/davinci/da8xxevm/hawkboard_nand_spl.c | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-)