From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXvl9-0007n1-GH for barebox@lists.infradead.org; Sat, 06 Jan 2018 21:12:12 +0000 Received: by mail-lf0-x244.google.com with SMTP id e27so8451800lfb.9 for ; Sat, 06 Jan 2018 13:11:51 -0800 (PST) From: Sam Ravnborg Date: Sat, 6 Jan 2018 22:11:18 +0100 Message-Id: <20180106211118.24249-22-sam@ravnborg.org> In-Reply-To: <20180106210450.GA21127@ravnborg.org> References: <20180106210450.GA21127@ravnborg.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v5 22/22] arm: at91: remove leftovers from moving reset code in mach-at91 To: Barebox List Cc: Sam Ravnborg Signed-off-by: Sam Ravnborg Reviewed-by: Andrey Smirnov --- arch/arm/mach-at91/Kconfig | 11 -- arch/arm/mach-at91/Makefile | 5 - arch/arm/mach-at91/at91sam9260_lowlevel_init.c | 48 ----- arch/arm/mach-at91/at91sam9263_lowlevel_init.c | 48 ----- arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 199 --------------------- .../mach-at91/include/mach/at91_lowlevel_init.h | 46 ----- 6 files changed, 357 deletions(-) delete mode 100644 arch/arm/mach-at91/at91sam9260_lowlevel_init.c delete mode 100644 arch/arm/mach-at91/at91sam9263_lowlevel_init.c delete mode 100644 arch/arm/mach-at91/at91sam926x_lowlevel_init.c delete mode 100644 arch/arm/mach-at91/include/mach/at91_lowlevel_init.h diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 74e1a862b..fa9caedc9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -37,17 +37,6 @@ config HAVE_AT91_BOOTSTRAP config AT91SAM926X_BOARD_INIT bool -# Select if board uses the common at91sam926x_lowlevel_init -config AT91SAM926X_LWL - bool - -# Select if board uses barebox reset vector from mach-at91 -# as implemented in the *lowlevel_init.c files -config AT91SAM9260_LWL - bool -config AT91SAM9263_LWL - bool - config AT91SAM9_SMC bool diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 7193b8690..8462cba60 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -8,11 +8,6 @@ obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o -lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o - -lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o -lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o - obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o diff --git a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c deleted file mode 100644 index 7f84185ef..000000000 --- a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD - * - * Under GPLv2 - */ - -#define __LOWLEVEL_INIT__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void __bare_init at91sam9260_lowlevel_init(void) -{ - struct at91sam926x_lowlevel_cfg cfg; - - cfg.pio = IOMEM(AT91SAM9260_BASE_PIOC); - cfg.sdramc = IOMEM(AT91SAM9260_BASE_SDRAMC); - cfg.ebi_pio_is_peripha = false; - cfg.matrix_csa = AT91_MATRIX_EBICSA; - - at91sam926x_lowlevel_init(&cfg); - - barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc), - NULL); -} - -void __naked __bare_init barebox_arm_reset_vector(void) -{ - arm_cpu_lowlevel_init(); - - arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16); - - at91sam9260_lowlevel_init(); -} diff --git a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c deleted file mode 100644 index 0be84551f..000000000 --- a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD - * - * Under GPLv2 - */ - -#define __LOWLEVEL_INIT__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void __bare_init at91sam9263_lowlevel_init(void) -{ - struct at91sam926x_lowlevel_cfg cfg; - - cfg.pio = IOMEM(AT91SAM9263_BASE_PIOD); - cfg.sdramc = IOMEM(AT91SAM9263_BASE_SDRAMC0); - cfg.ebi_pio_is_peripha = true; - cfg.matrix_csa = AT91_MATRIX_EBI0CSA; - - at91sam926x_lowlevel_init(&cfg); - - barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc), - NULL); -} - -void __naked __bare_init barebox_arm_reset_vector(void) -{ - arm_cpu_lowlevel_init(); - - arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16); - - at91sam9263_lowlevel_init(); -} diff --git a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c deleted file mode 100644 index 5dd8bc4e6..000000000 --- a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at) - * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD - * - * Under GPLv2 - */ - -#define __LOWLEVEL_INIT__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "gpio.h" - -static void inline access_sdram(void) -{ - writel(0x00000000, AT91_SDRAM_BASE); -} - -static void inline pmc_check_mckrdy(void) -{ - u32 r; - - do { - r = at91_pmc_read(AT91_PMC_SR); - } while (!(r & AT91_PMC_MCKRDY)); -} - -static int inline running_in_sram(void) -{ - u32 addr = get_pc(); - - addr >>= 28; - return addr == 0; -} - -#define at91_sdramc_read(field) \ - __raw_readl(cfg->sdramc + field) - -#define at91_sdramc_write(field, value) \ - __raw_writel(value, cfg->sdramc + field) - -void __bare_init at91sam926x_sdramc_init(struct at91sam926x_lowlevel_cfg *cfg) -{ - u32 r; - int i; - int in_sram = running_in_sram(); - - /* - * SDRAMC Check if Refresh Timer Counter is already initialized - */ - r = at91_sdramc_read(AT91_SDRAMC_TR); - if (r && !in_sram) - return; - - /* SDRAMC_MR : Normal Mode */ - at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL); - - /* SDRAMC_TR - Refresh Timer register */ - at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr1); - - /* SDRAMC_CR - Configuration register*/ - at91_sdramc_write(AT91_SDRAMC_CR, cfg->sdrc_cr); - - /* Memory Device Type */ - at91_sdramc_write(AT91_SDRAMC_MDR, cfg->sdrc_mdr); - - /* SDRAMC_MR : Precharge All */ - at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_PRECHARGE); - - /* access SDRAM */ - access_sdram(); - - /* SDRAMC_MR : refresh */ - at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_REFRESH); - - /* access SDRAM 8 times */ - for (i = 0; i < 8; i++) - access_sdram(); - - /* SDRAMC_MR : Load Mode Register */ - at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_LMR); - - /* access SDRAM */ - access_sdram(); - - /* SDRAMC_MR : Normal Mode */ - at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL); - - /* access SDRAM */ - access_sdram(); - - /* SDRAMC_TR : Refresh Timer Counter */ - at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr2); - - /* access SDRAM */ - access_sdram(); -} - -void __bare_init at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg) -{ - u32 r; - int in_sram = running_in_sram(); - - at91sam926x_lowlevel_board_config(cfg); - - __raw_writel(cfg->wdt_mr, AT91_BASE_WDT + AT91_WDT_MR); - - /* configure PIOx as EBI0 D[16-31] */ - at91_mux_gpio_disable(cfg->pio, cfg->ebi_pio_pdr); - at91_mux_set_pullup(cfg->pio, cfg->ebi_pio_ppudr, true); - if (cfg->ebi_pio_is_peripha) - at91_mux_set_A_periph(cfg->pio, cfg->ebi_pio_ppudr); - - at91_sys_write(cfg->matrix_csa, cfg->ebi_csa); - - /* flash */ - at91_smc_write(cfg->smc_cs, AT91_SAM9_SMC_MODE, cfg->smc_mode); - - at91_smc_write(cfg->smc_cs, AT91_SMC_CYCLE, cfg->smc_cycle); - - at91_smc_write(cfg->smc_cs, AT91_SMC_PULSE, cfg->smc_pulse); - - at91_smc_write(cfg->smc_cs, AT91_SMC_SETUP, cfg->smc_setup); - - /* - * PMC Check if the PLL is already initialized - */ - r = at91_pmc_read(AT91_PMC_MCKR); - if (r & AT91_PMC_CSS && !in_sram) - return; - - /* - * Enable the Main Oscillator - */ - at91_pmc_write(AT91_CKGR_MOR, cfg->pmc_mor); - - do { - r = at91_pmc_read(AT91_PMC_SR); - } while (!(r & AT91_PMC_MOSCS)); - - /* - * PLLAR: x MHz for PCK - */ - at91_pmc_write(AT91_CKGR_PLLAR, cfg->pmc_pllar); - - do { - r = at91_pmc_read(AT91_PMC_SR); - } while (!(r & AT91_PMC_LOCKA)); - - /* - * PCK/x = MCK Master Clock from SLOW - */ - at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr1); - - pmc_check_mckrdy(); - - /* - * PCK/x = MCK Master Clock from PLLA - */ - at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr2); - - pmc_check_mckrdy(); - - /* - * Init SDRAM - */ - at91sam926x_sdramc_init(cfg); - - /* User reset enable*/ - at91_sys_write(AT91_RSTC_MR, cfg->rstc_rmr); - -#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP - /* MATRIX_MCFG - REMAP all masters */ - at91_sys_write(AT91_MATRIX_MCFG0, 0x1FF); -#endif - /* - * When boot from external boot - * we need to enable mck and ohter clock - * so enable all of them - * We will shutdown what we don't need later - */ - at91_pmc_write(AT91_PMC_PCER, 0xffffffff); -} diff --git a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h b/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h deleted file mode 100644 index d72dfff38..000000000 --- a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD - * - * Under GPLv2 - */ - -#ifndef __AT91_LOWLEVEL_INIT_H__ -#define __AT91_LOWLEVEL_INIT_H__ - -struct at91sam926x_lowlevel_cfg { - /* SoC specific */ - void __iomem *pio; - void __iomem *sdramc; - u32 ebi_pio_is_peripha; - u32 matrix_csa; - - /* board specific */ - u32 wdt_mr; - u32 ebi_pio_pdr; - u32 ebi_pio_ppudr; - u32 ebi_csa; - u32 smc_cs; - u32 smc_mode; - u32 smc_cycle; - u32 smc_pulse; - u32 smc_setup; - u32 pmc_mor; - u32 pmc_pllar; - u32 pmc_mckr1; - u32 pmc_mckr2; - u32 sdrc_cr; - u32 sdrc_tr1; - u32 sdrc_mdr; - u32 sdrc_tr2; - u32 rstc_rmr; -}; - -#ifdef CONFIG_AT91SAM926X_LWL -void at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg); -void at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg); -#else -static inline void at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg) {} -static inline void at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg) {} -#endif - -#endif /* __AT91_LOWLEVEL_INIT_H__ */ -- 2.12.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox