mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: Barebox List <barebox@lists.infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 24/24] arm: at91: remove leftovers from moving reset code in mach-at91
Date: Wed, 27 Dec 2017 21:50:33 +0100	[thread overview]
Message-ID: <20171227205033.26012-24-sam@ravnborg.org> (raw)
In-Reply-To: <20171227204842.GA20040@ravnborg.org>

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 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 2c379d96c..b877c269d 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 <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
-  */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-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 <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
-  */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-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 <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
-  */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/gpio.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-#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 <plagnioj@jcrosoft.com>
- *
- * 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

      parent reply	other threads:[~2017-12-27 20:52 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 01/24] arm: at91: refactor lowlevel_init selection Sam Ravnborg
2017-12-27 20:50 ` [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c Sam Ravnborg
2017-12-30  2:31   ` Andrey Smirnov
2017-12-27 20:50 ` [PATCH 03/24] arm: at91: add at91sam926x_board_init.h Sam Ravnborg
2017-12-30  2:56   ` Andrey Smirnov
2017-12-30 10:56     ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 04/24] at91sam9263ek: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 05/24] at91sam9261ek, at91sam9g10ek: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 06/24] pm9261: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 07/24] at91: drop unused at91sam9261_lowlevel_init Sam Ravnborg
2017-12-27 20:50 ` [PATCH 08/24] pm9263: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 09/24] usb-a926x: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 10/24] mmccpu: delete unused lowlevel_init Sam Ravnborg
2017-12-27 20:50 ` [PATCH 11/24] mmccpu: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 12/24] tny-a926x: delete unused tny_a9263_lowlevel_init.c Sam Ravnborg
2017-12-27 20:50 ` [PATCH 13/24] tny-a926x: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 14/24] qil-a926x: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 15/24] haba-knx: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 16/24] sama5d{3, 4}{xek, xplained}: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 17/24] at91sam9n12ek: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 18/24] at91sam9260ek, at91sam9g20ek: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 19/24] at91sam9m10g45ek, at91sam9m10ihd, pm9g45: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 20/24] animeo: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 21/24] telit-evk-pro3: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 22/24] dss11: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 23/24] at91rm9200ek: " Sam Ravnborg
2017-12-27 20:50 ` Sam Ravnborg [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171227205033.26012-24-sam@ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox