From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dinh Nguyen Date: Tue, 20 Dec 2016 09:17:15 -0600 Subject: [U-Boot] [PATCH 10/10] arm: socfpga: arria10: Added Arria10 critical HW initialization to spl In-Reply-To: <1481011884-3841-1-git-send-email-tien.fong.chee@intel.com> References: <1481011884-3841-1-git-send-email-tien.fong.chee@intel.com> Message-ID: <6d45727a-d9db-da75-4974-a78c7477c107@kernel.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 12/06/2016 02:11 AM, Chee Tien Fong wrote: > From: Tien Fong Chee > > This patch adding the Arria10 critical hardware initialization before > enabling console print out in spl. > > Signed-off-by: Tien Fong Chee > Cc: Marek Vasut > Cc: Dinh Nguyen > Cc: Chin Liang See > Cc: Tien Fong > --- > arch/arm/mach-socfpga/spl.c | 86 +++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 83 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c > index fec4c7a..9375514 100644 > --- a/arch/arm/mach-socfpga/spl.c > +++ b/arch/arm/mach-socfpga/spl.c > @@ -1,7 +1,7 @@ > /* > - * Copyright (C) 2012 Altera Corporation > + * Copyright (C) 2012-2016 Altera Corporation > * > - * SPDX-License-Identifier: GPL-2.0+ > + * SPDX-License-Identifier: GPL-2.0 > */ Shouldn't be changing the license. > > #include > @@ -19,22 +19,32 @@ > #include > #include > #include > +#include > +#include > +#include > +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > +#include > +#endif I don't know about all these includes, do you really need them? I don't see where you would need pinmux.h in this patch. > > DECLARE_GLOBAL_DATA_PTR; > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > static struct pl310_regs *const pl310 = > (struct pl310_regs *)CONFIG_SYS_PL310_BASE; > static struct scu_registers *scu_regs = > (struct scu_registers *)SOCFPGA_MPUSCU_ADDRESS; > static struct nic301_registers *nic301_regs = > (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS; > -static struct socfpga_system_manager *sysmgr_regs = > +#endif > + > +static const struct socfpga_system_manager *sysmgr_regs = > (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; > > u32 spl_boot_device(void) > { > const u32 bsel = readl(&sysmgr_regs->bootinfo); > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > switch (bsel & 0x7) { > case 0x1: /* FPGA (HPS2FPGA Bridge) */ > return BOOT_DEVICE_RAM; > @@ -55,6 +65,24 @@ u32 spl_boot_device(void) > printf("Invalid boot device (bsel=%08x)!\n", bsel); > hang(); > } > +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > + switch ((bsel>>12) & 0x7) { > + case 0x1: /* FPGA (HPS2FPGA Bridge) */ > + return BOOT_DEVICE_RAM; > + case 0x2: /* NAND Flash (1.8V) */ > + case 0x3: /* NAND Flash (3.0V) */ > + return BOOT_DEVICE_NAND; > + case 0x4: /* SD/MMC External Transceiver (1.8V) */ > + case 0x5: /* SD/MMC Internal Transceiver (3.0V) */ > + return BOOT_DEVICE_MMC1; > + case 0x6: /* QSPI Flash (1.8V) */ > + case 0x7: /* QSPI Flash (3.0V) */ > + return BOOT_DEVICE_SPI; > + default: > + printf("Invalid boot device (bsel=%08x)!\n", bsel); > + hang(); > + } > +#endif > } You should just do a shift define here, so you don't have to add all this extra code here. Something like switch ((bsel >> BOOTINFO_BSEL_SHIFT) & 0x7) > > #ifdef CONFIG_SPL_MMC_SUPPORT > @@ -68,6 +96,7 @@ u32 spl_boot_mode(const u32 boot_device) > } > #endif > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > static void socfpga_nic301_slave_ns(void) > { > writel(0x1, &nic301_regs->lwhps2fpgaregs); > @@ -182,3 +211,54 @@ void board_init_f(ulong dummy) > /* Configure simple malloc base pointer into RAM. */ > gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024); > } > +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > +void board_init_f(ulong dummy) > +{ > + memset(__bss_start, 0, __bss_end - __bss_start); > + /* > + * Configure Clock Manager to use intosc clock instead external osc to > + * ensure success watchdog operation. We do it as early as possible. > + */ > + cm_use_intosc(); > + > + watchdog_disable(); Why? > + > + arch_early_init_r(); I don't think you should be calling this here. > + > +#ifdef CONFIG_HW_WATCHDOG > + /* release osc1 watchdog timer 0 from reset */ > + reset_deassert_osc1wd0(); > + > + /* reconfigure and enable the watchdog */ > + hw_watchdog_init(); > + WATCHDOG_RESET(); Do you really need all these WATCHDOG_RESET()'s? > +#endif /* CONFIG_HW_WATCHDOG */ > + > +#ifdef CONFIG_OF_CONTROL There's no need for this #ifdef. If you build for ARCH_SOCFPGA is OF_CONTROL selected. > + /* We need to access to FDT as this stage */ Why? Dinh