leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: UniPhier: split clkrst_init() into two functions

Browse Source 
Split the current clkrst_init() into two functions:

 - early_clkrst_init(): called from SPL
  Deassert the reset signals of the memory controller and some other
  basic cores.

 - clkrst_init(): called from main U-boot
  Deassert the reset signals that are necessary for the access to
  peripherals etc.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2015-02-27 02:26:51 +09:00
parent f267b81e20
commit 198a97a6ab
11 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-uniphier/board_early_init_f.c
View File

@ -9,6 +9,7 @@
#include <mach/board.h> #include <mach/board.h>
void pin_init(void); void pin_init(void);
void clkrst_init(void);
int board_early_init_f(void) int board_early_init_f(void)
{ {
@ -18,5 +19,9 @@ int board_early_init_f(void)
led_write(U, 1, , ); led_write(U, 1, , );
clkrst_init();
led_write(U, 2, , );
return 0; return 0;
} }

4
arch/arm/mach-uniphier/ph1-ld4/Makefile
View File

@ -4,10 +4,10 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o clkrst_init.o \ obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \
pll_spectrum.o umc_init.o ddrphy_init.o pll_spectrum.o umc_init.o ddrphy_init.o
else else
obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o
obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
endif endif

22
arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
View File

@ -1,11 +1,10 @@
/* /*
* Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2011-2015 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com> * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <mach/sc-regs.h> #include <mach/sc-regs.h>
@ -15,15 +14,26 @@ void clkrst_init(void)
/* deassert reset */ /* deassert reset */
tmp = readl(SC_RSTCTRL); tmp = readl(SC_RSTCTRL);
tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1 #ifdef CONFIG_UNIPHIER_ETH
| SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND; tmp |= SC_RSTCTRL_NRST_ETHER;
#endif
#ifdef CONFIG_NAND_DENALI
tmp |= SC_RSTCTRL_NRST_NAND;
#endif
writel(tmp, SC_RSTCTRL); writel(tmp, SC_RSTCTRL);
readl(SC_RSTCTRL); /* dummy read */ readl(SC_RSTCTRL); /* dummy read */
/* privide clocks */ /* privide clocks */
tmp = readl(SC_CLKCTRL); tmp = readl(SC_CLKCTRL);
tmp |= SC_CLKCTRL_CEN_ETHER | SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_UMC #ifdef CONFIG_UNIPHIER_ETH
| SC_CLKCTRL_CEN_NAND | SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI; tmp |= SC_CLKCTRL_CEN_ETHER;
#endif
#ifdef CONFIG_USB_EHCI_UNIPHIER
tmp |= SC_CLKCTRL_CEN_MIO;
#endif
#ifdef CONFIG_NAND_DENALI
tmp |= SC_CLKCTRL_CEN_NAND;
#endif
writel(tmp, SC_CLKCTRL); writel(tmp, SC_CLKCTRL);
readl(SC_CLKCTRL); /* dummy read */ readl(SC_CLKCTRL); /* dummy read */
} }

1
arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c Normal file
View File

@ -0,0 +1 @@
#include "../ph1-pro4/early_clkrst_init.c"

4
arch/arm/mach-uniphier/ph1-pro4/Makefile
View File

@ -4,10 +4,10 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
obj-y += sbc_init.o sg_init.o pll_init.o clkrst_init.o \ obj-y += sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \
pll_spectrum.o umc_init.o ddrphy_init.o pll_spectrum.o umc_init.o ddrphy_init.o
else else
obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o
obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
endif endif

22
arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
View File

@ -1,11 +1,10 @@
/* /*
* Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2011-2015 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com> * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <mach/sc-regs.h> #include <mach/sc-regs.h>
@ -15,15 +14,26 @@ void clkrst_init(void)
/* deassert reset */ /* deassert reset */
tmp = readl(SC_RSTCTRL); tmp = readl(SC_RSTCTRL);
tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1 #ifdef CONFIG_UNIPHIER_ETH
| SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND; tmp |= SC_RSTCTRL_NRST_ETHER;
#endif
#ifdef CONFIG_NAND_DENALI
tmp |= SC_RSTCTRL_NRST_NAND;
#endif
writel(tmp, SC_RSTCTRL); writel(tmp, SC_RSTCTRL);
readl(SC_RSTCTRL); /* dummy read */ readl(SC_RSTCTRL); /* dummy read */
/* privide clocks */ /* privide clocks */
tmp = readl(SC_CLKCTRL); tmp = readl(SC_CLKCTRL);
tmp |= SC_CLKCTRL_CEN_ETHER | SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_UMC #ifdef CONFIG_UNIPHIER_ETH
| SC_CLKCTRL_CEN_NAND | SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI; tmp |= SC_CLKCTRL_CEN_ETHER;
#endif
#ifdef CONFIG_USB_EHCI_UNIPHIER
tmp |= SC_CLKCTRL_CEN_MIO;
#endif
#ifdef CONFIG_NAND_DENALI
tmp |= SC_CLKCTRL_CEN_NAND;
#endif
writel(tmp, SC_CLKCTRL); writel(tmp, SC_CLKCTRL);
readl(SC_CLKCTRL); /* dummy read */ readl(SC_CLKCTRL); /* dummy read */
} }

26
arch/arm/mach-uniphier/ph1-pro4/early_clkrst_init.c Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright (C) 2011-2015 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/io.h>
#include <mach/sc-regs.h>
void early_clkrst_init(void)
{
u32 tmp;
/* deassert reset */
tmp = readl(SC_RSTCTRL);
tmp |= SC_RSTCTRL_NRST_UMC1 | SC_RSTCTRL_NRST_UMC0;
writel(tmp, SC_RSTCTRL);
readl(SC_RSTCTRL); /* dummy read */
/* privide clocks */
tmp = readl(SC_CLKCTRL);
tmp |= SC_CLKCTRL_CEN_UMC | SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI;
writel(tmp, SC_CLKCTRL);
readl(SC_CLKCTRL); /* dummy read */
}

4
arch/arm/mach-uniphier/ph1-sld8/Makefile
View File

@ -4,10 +4,10 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o clkrst_init.o \ obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \
pll_spectrum.o umc_init.o ddrphy_init.o pll_spectrum.o umc_init.o ddrphy_init.o
else else
obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o
obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
endif endif

30
arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
View File

@ -1,29 +1 @@
/* #include "../ph1-ld4/clkrst_init.c"
* Copyright (C) 2011-2014 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/io.h>
#include <mach/sc-regs.h>
void clkrst_init(void)
{
u32 tmp;
/* deassert reset */
tmp = readl(SC_RSTCTRL);
tmp |= SC_RSTCTRL_NRST_ETHER | SC_RSTCTRL_NRST_UMC1
| SC_RSTCTRL_NRST_UMC0 | SC_RSTCTRL_NRST_NAND;
writel(tmp, SC_RSTCTRL);
readl(SC_RSTCTRL); /* dummy read */
/* privide clocks */
tmp = readl(SC_CLKCTRL);
tmp |= SC_CLKCTRL_CEN_ETHER | SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_UMC
| SC_CLKCTRL_CEN_NAND | SC_CLKCTRL_CEN_SBC | SC_CLKCTRL_CEN_PERI;
writel(tmp, SC_CLKCTRL);
readl(SC_CLKCTRL); /* dummy read */
}

1
arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c Normal file
View File

@ -0,0 +1 @@
#include "../ph1-ld4/early_clkrst_init.c"

4
arch/arm/mach-uniphier/spl.c
View File

@ -18,7 +18,7 @@ void sbc_init(void);
void sg_init(void); void sg_init(void);
void pll_init(void); void pll_init(void);
void pin_init(void); void pin_init(void);
void clkrst_init(void); void early_clkrst_init(void);
int umc_init(void); int umc_init(void);
void enable_dpll_ssc(void); void enable_dpll_ssc(void);
@ -38,7 +38,7 @@ void spl_board_init(void)
led_write(L, 0, , ); led_write(L, 0, , );
clkrst_init(); early_clkrst_init();
led_write(L, 1, , ); led_write(L, 1, , );