diff options
Diffstat (limited to 'arch/arm/boards/vscom-baltos/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/vscom-baltos/lowlevel.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/arch/arm/boards/vscom-baltos/lowlevel.c b/arch/arm/boards/vscom-baltos/lowlevel.c index 98bbbaae16..aee0cde651 100644 --- a/arch/arm/boards/vscom-baltos/lowlevel.c +++ b/arch/arm/boards/vscom-baltos/lowlevel.c @@ -1,20 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-only + #include <common.h> #include <init.h> #include <linux/sizes.h> #include <io.h> #include <linux/string.h> #include <debug_ll.h> +#include <mach/omap/debug_ll.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> -#include <mach/am33xx-silicon.h> -#include <mach/am33xx-clock.h> -#include <mach/generic.h> -#include <mach/sdrc.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> -#include <mach/am33xx-mux.h> -#include <mach/am33xx-generic.h> -#include <mach/wdt.h> +#include <mach/omap/am33xx-silicon.h> +#include <mach/omap/am33xx-clock.h> +#include <mach/omap/generic.h> +#include <mach/omap/sdrc.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> +#include <mach/omap/am33xx-mux.h> +#include <mach/omap/am33xx-generic.h> static const struct am33xx_ddr_data ddr3_data = { .rd_slave_ratio0 = 0x38, @@ -66,7 +68,7 @@ static const struct am33xx_emif_regs ddr3_regs_256mb = { }; -extern char __dtb_am335x_baltos_minimal_start[]; +extern char __dtb_z_am335x_baltos_minimal_start[]; /** * @brief The basic entry point for board initialization. @@ -82,15 +84,9 @@ static noinline void baltos_sram_init(void) uint32_t sdram_size; void *fdt; - fdt = __dtb_am335x_baltos_minimal_start; + fdt = __dtb_z_am335x_baltos_minimal_start; - /* WDT1 is already running when the bootloader gets control - * Disable it to avoid "random" resets - */ - __raw_writel(WDT_DISABLE_CODE1, AM33XX_WDT_REG(WSPR)); - while (__raw_readl(AM33XX_WDT_REG(WWPS)) != 0x0); - __raw_writel(WDT_DISABLE_CODE2, AM33XX_WDT_REG(WSPR)); - while (__raw_readl(AM33XX_WDT_REG(WWPS)) != 0x0); + omap_watchdog_disable(IOMEM(AM33XX_WDT_BASE)); /* Setup the PLLs and the clocks for the peripherals */ am33xx_pll_init(MPUPLL_M_600, DDRPLL_M_400); @@ -102,7 +98,7 @@ static noinline void baltos_sram_init(void) am33xx_uart_soft_reset((void *)AM33XX_UART0_BASE); am33xx_enable_uart0_pin_mux(); - omap_uart_lowlevel_init((void *)AM33XX_UART0_BASE); + omap_debug_ll_init(); putc_ll('>'); am335x_barebox_entry(fdt); @@ -132,7 +128,7 @@ ENTRY_FUNCTION(start_am33xx_baltos_sdram, r0, r1, r2) */ __raw_writel(0x000010ff, AM33XX_PRM_RSTTIME); - fdt = __dtb_am335x_baltos_minimal_start; + fdt = __dtb_z_am335x_baltos_minimal_start; fdt += get_runtime_offset(); |