spl_atmel.c: Switch s_init to board_init_f

To facilitate changing lowlevel_init to become s_init, move the current contents of s_int() to gate_ungate_all_mx6_pfds() (and add extern to arch/arm/include/asm/arch-mx6/crm_regs.h) and add a default weak spl_board_init() that calls this function. The cm_fx6 platform already has a spl_board_init() so make that call the new function as well.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Signed-off-by Tom Rini <[email protected]>

To facilitate changing lowlevel_init to become s_init, move the current contents of s_int() to gate_ungate_all_mx6_pfds() (and add extern to arch/arm/include/asm/arch-mx6/crm_regs.h) and add a default weak spl_board_init() that calls this function. The cm_fx6 platform already has a spl_board_init() so make that call the new function as well.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Signed-off-by Tom Rini <[email protected]>

To facilitate changing lowlevel_init to become s_init, move the current contents of s_int() to gate_ungate_all_mx6_pfds() (and add extern to arch/arm/include/asm/arch-mx6/crm_regs.h) and add a default weak spl_board_init() that calls this function. The cm_fx6 platform already has a spl_board_init() so make that call the new function as well.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Nikita Kiryanov <[email protected]>

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/cpu/armv7/mx6/soc.c             |    7 ++++++-
 arch/arm/include/asm/arch-mx6/crm_regs.h |    2 ++
 board/compulab/cm_fx6/spl.c              |    2 ++
 include/configs/imx6_spl.h               |    1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

arch/arm/cpu/armv7/mx6/soc.c +6 -1

index 5f5f497..ecc4272 100644
@@ -385,7 +385,7 @@ const struct boot_mode soc_boot_modes[] = {
 	{NULL,		0},
 };
 
-void s_init(void)
+void gate_ungate_all_mx6_pfds(void)
 {
 	struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
 	struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;

@@ -429,6 +429,11 @@ void s_init(void)
 	writel(mask528, &anatop->pfd_528_clr);
 }
 
+void __weak spl_board_init(void)
+{
+	gate_ungate_all_mx6_pfds();
+}
+
 #ifdef CONFIG_IMX_HDMI
 void imx_enable_hdmi_phy(void)
 {

arch/arm/include/asm/arch-mx6/crm_regs.h +2 -0

index 39f3c07..700175e 100644
@@ -104,6 +104,8 @@ struct mxc_ccm_reg {
 	u32 analog_pfd_528_clr;
 	u32 analog_pfd_528_tog;
 };
+
+void gate_ungate_all_mx6_pfds(void);
 #endif
 
 /* Define the bits in register CCR */

board/compulab/cm_fx6/spl.c +2 -0

index 5b4b76f..83be867 100644
@@ -341,6 +341,8 @@ void spl_board_init(void)
 {
 	u32 boot_device = spl_boot_device();
 
+	gate_ungate_all_mx6_pfds();
+
 	if (boot_device == BOOT_DEVICE_SPI)
 		puts("Booting from SPI flash\n");
 	else if (boot_device == BOOT_DEVICE_MMC1)

include/configs/imx6_spl.h +0 -0

index 1b9c277..d49370d 100644

To facilitate changing lowlevel_init to become s_init, move the current contents of s_init into board_init_f and add the rest of what board_init_f does here.

Cc Bo Shen <[email protected]>

Cc Andreas Bie?mann <[email protected]>

Tested-by Matt Porter <[email protected]> on sama5d3_xplained

Signed-off-by Tom Rini <[email protected]>

---
 arch/arm/cpu/at91-common/spl_atmel.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

arch/arm/cpu/at91-common/spl_atmel.c +6 -1

index 7297530..d815050 100644
@@ -58,7 +58,7 @@ static void switch_to_main_crystal_osc(void)
 	writel(tmp, &pmc->mor);
 }
 
-void s_init(void)
+void board_init_f(ulong dummy)
 {
 	switch_to_main_crystal_osc();
 

@@ -77,4 +77,9 @@ void s_init(void)
 	preloader_console_init();
 
 	mem_init();
+
+	/* Clear the BSS. */
+	memset(__bss_start, 0, __bss_end - __bss_start);
+
+	board_init_r(NULL, 0);
 }

To facilitate changing lowlevel_init to become s_init, move the current contents of s_init into board_init_f and add the rest of what board_init_f does here.
In order to compile clean without CONFIG_SKIP_LOWLEVEL_INIT set, leave an empty stub of s_init(). It can be removed when lowlevel_init becomes s_init.

Cc Bo Shen <[email protected]>

Cc Andreas Bie?mann <[email protected]>

Tested-by Matt Porter <[email protected]> on sama5d3_xplained

Signed-off-by Tom Rini <[email protected]>

[rebased on current master, leave s_init() as empty stub]

Signed-off-by Andreas Bie?mann <[email protected]>

---
arch/arm/mach-at91/spl_atmel.c | 7 ++++++-

1 file changed, 6 insertions(+), 1 deletion(-)

To facilitate changing lowlevel_init to become s_init, move the current contents of s_init into board_init_f and add the rest of what board_init_f does here.
In order to compile clean without CONFIG_SKIP_LOWLEVEL_INIT set, leave an empty stub of s_init(). It can be removed when lowlevel_init becomes s_init.

Cc Bo Shen <[email protected]>

Cc Andreas Bie?mann <[email protected]>

Tested-by Matt Porter <[email protected]> on sama5d3_xplained

Signed-off-by Tom Rini <[email protected]>

[rebased on current master, leave s_init() as empty stub]

Signed-off-by Andreas Bie?mann <[email protected]>

---
arch/arm/mach-at91/spl_atmel.c | 7 ++++++-

1 file changed, 6 insertions(+), 1 deletion(-)