On Mon, Apr 01, 2019 at 12:18:21PM +0200, Ahmad Fatoum wrote: > This imports the low level init code from at91bootstrap > https://github.com/linux4sam/at91bootstrap/blob/v3.8.12/board/sama5d3_xplained/sama5d3_xplained.c > > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > .../boards/microchip-ksz9477-evb/lowlevel.c | 208 +++++++++++++++++- > arch/arm/mach-at91/Kconfig | 2 + > arch/arm/mach-at91/include/mach/at91_pmc.h | 8 + > arch/arm/mach-at91/include/mach/sama5d3.h | 1 + > images/Makefile.at91 | 5 + > 5 files changed, 220 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > index 4293f8aaa57d..cf44021bdfb7 100644 > --- a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > +++ b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > @@ -1,7 +1,19 @@ > +// SPDX-License-Identifier: GPL-2.0-only AND BSD-1-Clause > /* > + * Copyright (c) 2014, Atmel Corporation > * Copyright (C) 2018 Ahmad Fatoum, Pengutronix > * > - * Under GPLv2 > + * > + * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR > + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE > + * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, > + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, > + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > #include <common.h> > @@ -10,18 +22,206 @@ > #include <asm/barebox-arm-head.h> > #include <asm/barebox-arm.h> > > -#include <mach/hardware.h> > +#include <debug_ll.h> > +#include <linux/kconfig.h> > +#include <mach/at91_dbgu.h> > +#include <mach/at91_ddrsdrc.h> > +#include <mach/at91_pmc_ll.h> > +#include <mach/at91_pio.h> > +#include <mach/at91_wdt.h> > +#include <mach/ddramc.h> > +#include <mach/early_udelay.h> > +#include <mach/gpio.h> > +#include <mach/iomux.h> > + > +/* PCK = 528MHz, MCK = 132MHz */ > +#define MASTER_CLOCK 132000000 > + > +#define PMC_BASE IOMEM(SAMA5D3_BASE_PMC) > +#define sama5d3_pmc_enable_periph_clock(clk) \ > + at91_pmc_enable_periph_clock(PMC_BASE, clk) > + > +#define BAUDRATE(mck, baud) \ > + ((((((mck) * 10) / ((baud) * 16)) % 10) >= 5) ? \ > + (mck / (baud * 16) + 1) : ((mck) / (baud * 16))) This looks useful for others aswell. Please create a static inline function in mach/at91_dbgu.h.h for this. While at it you could untangle the code a little. > + > + > +static void configure_periph_a_piob_pin(unsigned int pin) > +{ > + void __iomem *pio = IOMEM(SAMA5D3_BASE_PIOB); > + u32 mask = pin_to_mask(pin); > + > + at91_mux_disable_interrupt(pio, mask); > + at91_mux_set_pullup(pio, mask, 0); > + at91_mux_pio3_set_pulldown(pio, mask, 0); > + > + at91_mux_pio3_set_A_periph(pio, mask); > + > + at91_mux_gpio_disable(pio, mask); > +} Not sure where this leads, but we alredy have at91_mux_pin which could be used for this. Would it be an option to make this available to the pbl? > +static void ddramc_reg_config(struct at91_ddramc_register *ddramc_config) > +{ > + ddramc_config->mdr = (AT91C_DDRC2_DBW_32_BITS > + | AT91C_DDRC2_MD_DDR2_SDRAM); > + > + ddramc_config->cr = (AT91C_DDRC2_NC_DDR10_SDR9 > + | AT91C_DDRC2_NR_13 > + | AT91C_DDRC2_CAS_3 > + | AT91C_DDRC2_DISABLE_RESET_DLL > + | AT91C_DDRC2_ENABLE_DLL > + | AT91C_DDRC2_ENRDM_ENABLE > + | AT91C_DDRC2_NB_BANKS_8 > + | AT91C_DDRC2_NDQS_DISABLED > + | AT91C_DDRC2_DECOD_INTERLEAVED > + | AT91C_DDRC2_UNAL_SUPPORTED); > + > + /* > + * The DDR2-SDRAM device requires a refresh every 15.625 us or 7.81 us. > + * With a 133 MHz frequency, the refresh timer count register must to be > + * set with (15.625 x 133 MHz) ~ 2084 i.e. 0x824 > + * or (7.81 x 133 MHz) ~ 1039 i.e. 0x40F. > + */ > + ddramc_config->rtr = 0x40F; /* Refresh timer: 7.812us */ > + > + /* One clock cycle @ 133 MHz = 7.5 ns */ > + ddramc_config->t0pr = (AT91C_DDRC2_TRAS_(6) /* 6 * 7.5 = 45 ns */ > + | AT91C_DDRC2_TRCD_(2) /* 2 * 7.5 = 22.5 ns */ > + | AT91C_DDRC2_TWR_(2) /* 2 * 7.5 = 15 ns */ > + | AT91C_DDRC2_TRC_(8) /* 8 * 7.5 = 75 ns */ > + | AT91C_DDRC2_TRP_(2) /* 2 * 7.5 = 15 ns */ > + | AT91C_DDRC2_TRRD_(2) /* 2 * 7.5 = 15 ns */ > + | AT91C_DDRC2_TWTR_(2) /* 2 clock cycles min */ > + | AT91C_DDRC2_TMRD_(2)); /* 2 clock cycles */ > + > + ddramc_config->t1pr = (AT91C_DDRC2_TXP_(2) /* 2 clock cycles */ > + | AT91C_DDRC2_TXSRD_(200) /* 200 clock cycles */ > + | AT91C_DDRC2_TXSNR_(19) /* 19 * 7.5 = 142.5 ns */ > + | AT91C_DDRC2_TRFC_(17)); /* 17 * 7.5 = 127.5 ns */ > + > + ddramc_config->t2pr = (AT91C_DDRC2_TFAW_(6) /* 6 * 7.5 = 45 ns */ > + | AT91C_DDRC2_TRTP_(2) /* 2 clock cycles min */ > + | AT91C_DDRC2_TRPA_(2) /* 2 * 7.5 = 15 ns */ > + | AT91C_DDRC2_TXARDS_(8) /* = TXARD */ > + | AT91C_DDRC2_TXARD_(8)); /* MR12 = 1 */ > +} Why not a static initializer? > + > +static void sama5d3_ddramc_init(void) > +{ > + struct at91_ddramc_register ddramc_reg; > + u32 reg; > + > + ddramc_reg_config(&ddramc_reg); > + > + /* enable ddr2 clock */ > + sama5d3_pmc_enable_periph_clock(SAMA5D3_ID_MPDDRC); > + at91_pmc_enable_system_clock(PMC_BASE, AT91CAP9_PMC_DDR); > + > + > + /* Init the special register for sama5d3x */ > + /* MPDDRC DLL Slave Offset Register: DDR2 configuration */ > + reg = AT91C_MPDDRC_S0OFF_1 > + | AT91C_MPDDRC_S2OFF_1 > + | AT91C_MPDDRC_S3OFF_1; > + writel(reg, SAMA5D3_BASE_MPDDRC + AT91C_MPDDRC_DLL_SOR); > > + /* MPDDRC DLL Master Offset Register */ > + /* write master + clk90 offset */ > + reg = AT91C_MPDDRC_MOFF_7 > + | AT91C_MPDDRC_CLK90OFF_31 > + | AT91C_MPDDRC_SELOFF_ENABLED | AT91C_MPDDRC_KEY; > + writel(reg, SAMA5D3_BASE_MPDDRC + AT91C_MPDDRC_DLL_MOR); > + > + /* MPDDRC I/O Calibration Register */ > + /* DDR2 RZQ = 50 Ohm */ > + /* TZQIO = 4 */ > + reg = AT91C_MPDDRC_RDIV_DDR2_RZQ_50 > + | AT91C_MPDDRC_TZQIO_4; > + writel(reg, SAMA5D3_BASE_MPDDRC + AT91C_MPDDRC_IO_CALIBR); > + > + /* DDRAM2 Controller initialize */ > + at91_ddram_initialize(SAMA5D3_BASE_MPDDRC, SAMA5_DDRCS, &ddramc_reg); > +} > + > +extern char __dtb_z_at91_microchip_ksz9477_evb_boot_bin_start[]; > extern char __dtb_z_at91_microchip_ksz9477_evb_start[]; > > -ENTRY_FUNCTION(start_sama5d3_xplained_ung8071, r0, r1, r2) > +static noinline void board_init(void) > { > - void *fdt; > + void *fdt = NULL; This change looks unnecessary. > + > + at91_wdt_disable(IOMEM(SAMA5D3_BASE_WDT)); > + at91_pmc_init(PMC_BASE, AT91_PMC_LL_SAMA5D3); > + > + /* At this stage the main oscillator > + * is supposed to be enabled PCK = MCK = MOSC > + */ > + > + /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ > + at91_pmc_cfg_plla(PMC_BASE, AT91_PMC3_MUL_(43) | AT91_PMC_OUT_0 > + | AT91_PMC_PLLCOUNT > + | AT91_PMC_DIV_BYPASS, > + AT91_PMC_LL_SAMA5D3); > + > + /* Initialize PLLA charge pump */ > + at91_pmc_init_pll(PMC_BASE, AT91_PMC_IPLLA_3); > + > + /* Switch PCK/MCK on Main clock output */ > + at91_pmc_cfg_mck(PMC_BASE, AT91SAM9_PMC_MDIV_4 | AT91_PMC_CSS_MAIN, > + AT91_PMC_LL_SAMA5D3); > + > + /* Switch PCK/MCK on PLLA output */ > + at91_pmc_cfg_mck(PMC_BASE, AT91SAM9_PMC_MDIV_4 | AT91_PMC_CSS_PLLA, > + AT91_PMC_LL_SAMA5D3); > + > + if (IS_ENABLED(CONFIG_DEBUG_LL)) > + dbgu_init(); > + > + early_udelay_init(PMC_BASE, IOMEM(SAMA5D3_BASE_PIT), > + SAMA5D3_ID_PIT, MASTER_CLOCK, AT91_PMC_LL_SAMA5D3); > + > + sama5d3_ddramc_init(); > > + fdt = __dtb_z_at91_microchip_ksz9477_evb_boot_bin_start + get_runtime_offset(); You don't need get_runtime_offset() here as you already called relocate_to_current_adr/setup_c. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
