Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git] / board / freescale / ls2080ardb / ls2080ardb.c
index ea05ec6..5e2fc7c 100644 (file)
@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright 2017 NXP
  */
 #include <common.h>
+#include <env.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fdt_support.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <fsl-mc/fsl_mc.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <efi_loader.h>
 #include <i2c.h>
 #include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/ppa.h>
 #include <fsl_sec.h>
+#include <asm/arch-fsl-layerscape/fsl_icid.h>
 
+#ifdef CONFIG_FSL_QIXIS
 #include "../common/qixis.h"
 #include "ls2080ardb_qixis.h"
+#endif
 #include "../common/vid.h"
 
 #define PIN_MUX_SEL_SDHC       0x00
@@ -57,12 +61,53 @@ unsigned long long get_qixis_addr(void)
 
 int checkboard(void)
 {
+#ifdef CONFIG_FSL_QIXIS
        u8 sw;
+#endif
        char buf[15];
 
        cpu_name(buf);
        printf("Board: %s-RDB, ", buf);
 
+#ifdef CONFIG_TARGET_LS2081ARDB
+#ifdef CONFIG_FSL_QIXIS
+       sw = QIXIS_READ(arch);
+       printf("Board version: %c, ", (sw & 0xf) + 'A');
+
+       sw = QIXIS_READ(brdcfg[0]);
+       sw = (sw >> QIXIS_QMAP_SHIFT) & QIXIS_QMAP_MASK;
+       switch (sw) {
+       case 0:
+               puts("boot from QSPI DEV#0\n");
+               puts("QSPI_CSA_1 mapped to QSPI DEV#1\n");
+               break;
+       case 1:
+               puts("boot from QSPI DEV#1\n");
+               puts("QSPI_CSA_1 mapped to QSPI DEV#0\n");
+               break;
+       case 2:
+               puts("boot from QSPI EMU\n");
+               puts("QSPI_CSA_1 mapped to QSPI DEV#0\n");
+               break;
+       case 3:
+               puts("boot from QSPI EMU\n");
+               puts("QSPI_CSA_1 mapped to QSPI DEV#1\n");
+               break;
+       case 4:
+               puts("boot from QSPI DEV#0\n");
+               puts("QSPI_CSA_1 mapped to QSPI EMU\n");
+               break;
+       default:
+               printf("invalid setting of SW%u\n", sw);
+               break;
+       }
+       printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata));
+#endif
+       puts("SERDES1 Reference : ");
+       printf("Clock1 = 100MHz ");
+       printf("Clock2 = 161.13MHz");
+#else
+#ifdef CONFIG_FSL_QIXIS
        sw = QIXIS_READ(arch);
        printf("Board Arch: V%d, ", sw >> 4);
        printf("Board version: %c, boot from ", (sw & 0xf) + 'A');
@@ -78,10 +123,11 @@ int checkboard(void)
                printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH);
 
        printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata));
-
+#endif
        puts("SERDES1 Reference : ");
        printf("Clock1 = 156.25MHz ");
        printf("Clock2 = 156.25MHz");
+#endif
 
        puts("\nSERDES2 Reference : ");
        printf("Clock1 = 100MHz ");
@@ -92,6 +138,7 @@ int checkboard(void)
 
 unsigned long get_board_sys_clk(void)
 {
+#ifdef CONFIG_FSL_QIXIS
        u8 sysclk_conf = QIXIS_READ(brdcfg[1]);
 
        switch (sysclk_conf & 0x0F) {
@@ -110,14 +157,24 @@ unsigned long get_board_sys_clk(void)
        case QIXIS_SYSCLK_166:
                return 166666666;
        }
-       return 66666666;
+#endif
+       return 100000000;
 }
 
 int select_i2c_ch_pca9547(u8 ch)
 {
        int ret;
 
+#ifndef CONFIG_DM_I2C
        ret = i2c_write(I2C_MUX_PCA_ADDR_PRI, 0, 1, &ch, 1);
+#else
+       struct udevice *dev;
+
+       ret = i2c_get_chip_for_busnum(0, I2C_MUX_PCA_ADDR_PRI, 1, &dev);
+       if (!ret)
+               ret = dm_i2c_write(dev, 0, &ch, 1);
+#endif
+
        if (ret) {
                puts("PCA: failed to select proper channel\n");
                return ret;
@@ -133,6 +190,7 @@ int i2c_multiplexer_select_vid_channel(u8 channel)
 
 int config_board_mux(int ctrl_type)
 {
+#ifdef CONFIG_FSL_QIXIS
        u8 reg5;
 
        reg5 = QIXIS_READ(brdcfg[5]);
@@ -150,38 +208,30 @@ int config_board_mux(int ctrl_type)
        }
 
        QIXIS_WRITE(brdcfg[5], reg5);
-
+#endif
        return 0;
 }
 
 int board_init(void)
 {
-       char *env_hwconfig;
-       u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
 #ifdef CONFIG_FSL_MC_ENET
        u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE;
 #endif
-       u32 val;
 
        init_final_memctl_regs();
 
-       val = in_le32(dcfg_ccsr + DCFG_RCWSR13 / 4);
-
-       env_hwconfig = getenv("hwconfig");
-
-       if (hwconfig_f("dspi", env_hwconfig) &&
-           DCFG_RCWSR13_DSPI == (val & (u32)(0xf << 8)))
-               config_board_mux(MUX_TYPE_DSPI);
-       else
-               config_board_mux(MUX_TYPE_SDHC);
-
 #ifdef CONFIG_ENV_IS_NOWHERE
        gd->env_addr = (ulong)&default_environment[0];
 #endif
        select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
 
+#ifdef CONFIG_FSL_QIXIS
        QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN);
+#endif
 
+#ifdef CONFIG_FSL_CAAM
+       sec_init();
+#endif
 #ifdef CONFIG_FSL_LS_PPA
        ppa_init();
 #endif
@@ -194,22 +244,66 @@ int board_init(void)
        sec_init();
 #endif
 
+#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH)
+       pci_init();
+#endif
+
        return 0;
 }
 
 int board_early_init_f(void)
 {
+#ifdef CONFIG_SYS_I2C_EARLY_INIT
+       i2c_early_init_f();
+#endif
        fsl_lsch3_early_init_f();
        return 0;
 }
 
 int misc_init_r(void)
 {
+       char *env_hwconfig;
+       u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
+       u32 val;
+       struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
+       u32 svr = gur_in32(&gur->svr);
+
+       val = in_le32(dcfg_ccsr + DCFG_RCWSR13 / 4);
+
+       env_hwconfig = env_get("hwconfig");
+
+       if (hwconfig_f("dspi", env_hwconfig) &&
+           DCFG_RCWSR13_DSPI == (val & (u32)(0xf << 8)))
+               config_board_mux(MUX_TYPE_DSPI);
+       else
+               config_board_mux(MUX_TYPE_SDHC);
+
+       /*
+        * LS2081ARDB RevF board has smart voltage translator
+        * which needs to be programmed to enable high speed SD interface
+        * by setting GPIO4_10 output to zero
+        */
+#ifdef CONFIG_TARGET_LS2081ARDB
+               out_le32(GPIO4_GPDIR_ADDR, (1 << 21 |
+                                           in_le32(GPIO4_GPDIR_ADDR)));
+               out_le32(GPIO4_GPDAT_ADDR, (~(1 << 21) &
+                                           in_le32(GPIO4_GPDAT_ADDR)));
+#endif
        if (hwconfig("sdhc"))
                config_board_mux(MUX_TYPE_SDHC);
 
        if (adjust_vdd(0))
                printf("Warning: Adjusting core voltage failed.\n");
+       /*
+        * Default value of board env is based on filename which is
+        * ls2080ardb. Modify board env for other supported SoCs
+        */
+       if ((SVR_SOC_VER(svr) == SVR_LS2088A) ||
+           (SVR_SOC_VER(svr) == SVR_LS2048A))
+               env_set("board", "ls2088ardb");
+       else if ((SVR_SOC_VER(svr) == SVR_LS2081A) ||
+           (SVR_SOC_VER(svr) == SVR_LS2041A))
+               env_set("board", "ls2081ardb");
 
        return 0;
 }
@@ -228,13 +322,6 @@ void detail_board_ddr_info(void)
 #endif
 }
 
-#if defined(CONFIG_ARCH_MISC_INIT)
-int arch_misc_init(void)
-{
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_FSL_MC_ENET
 void fdt_fixup_board_enet(void *fdt)
 {
@@ -251,7 +338,8 @@ void fdt_fixup_board_enet(void *fdt)
                return;
        }
 
-       if (get_mc_boot_status() == 0)
+       if (get_mc_boot_status() == 0 &&
+           (is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
                fdt_status_okay(fdt, offset);
        else
                fdt_status_fail(fdt, offset);
@@ -264,13 +352,92 @@ void board_quiesce_devices(void)
 #endif
 
 #ifdef CONFIG_OF_BOARD_SETUP
+void fsl_fdt_fixup_flash(void *fdt)
+{
+       int offset;
+#ifdef CONFIG_TFABOOT
+       u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
+       u32 val;
+#endif
+
+/*
+ * IFC and QSPI are muxed on board.
+ * So disable IFC node in dts if QSPI is enabled or
+ * disable QSPI node in dts in case QSPI is not enabled.
+ */
+#ifdef CONFIG_TFABOOT
+       enum boot_src src = get_boot_src();
+       bool disable_ifc = false;
+
+       switch (src) {
+       case BOOT_SOURCE_IFC_NOR:
+               disable_ifc = false;
+               break;
+       case BOOT_SOURCE_QSPI_NOR:
+               disable_ifc = true;
+               break;
+       default:
+               val = in_le32(dcfg_ccsr + DCFG_RCWSR15 / 4);
+               if (DCFG_RCWSR15_IFCGRPABASE_QSPI == (val & (u32)0x3))
+                       disable_ifc = true;
+               break;
+       }
+
+       if (disable_ifc) {
+               offset = fdt_path_offset(fdt, "/soc/ifc");
+
+               if (offset < 0)
+                       offset = fdt_path_offset(fdt, "/ifc");
+       } else {
+               offset = fdt_path_offset(fdt, "/soc/quadspi");
+
+               if (offset < 0)
+                       offset = fdt_path_offset(fdt, "/quadspi");
+       }
+
+#else
+#ifdef CONFIG_FSL_QSPI
+       offset = fdt_path_offset(fdt, "/soc/ifc");
+
+       if (offset < 0)
+               offset = fdt_path_offset(fdt, "/ifc");
+#else
+       offset = fdt_path_offset(fdt, "/soc/quadspi");
+
+       if (offset < 0)
+               offset = fdt_path_offset(fdt, "/quadspi");
+#endif
+#endif
+
+       if (offset < 0)
+               return;
+
+       fdt_status_disabled(fdt, offset);
+}
+
 int ft_board_setup(void *blob, bd_t *bd)
 {
-       u64 base[CONFIG_NR_DRAM_BANKS];
-       u64 size[CONFIG_NR_DRAM_BANKS];
+       int i;
+       u16 mc_memory_bank = 0;
+
+       u64 *base;
+       u64 *size;
+       u64 mc_memory_base = 0;
+       u64 mc_memory_size = 0;
+       u16 total_memory_banks;
 
        ft_cpu_setup(blob, bd);
 
+       fdt_fixup_mc_ddr(&mc_memory_base, &mc_memory_size);
+
+       if (mc_memory_base != 0)
+               mc_memory_bank++;
+
+       total_memory_banks = CONFIG_NR_DRAM_BANKS + mc_memory_bank;
+
+       base = calloc(total_memory_banks, sizeof(u64));
+       size = calloc(total_memory_banks, sizeof(u64));
+
        /* fixup DT for the two GPP DDR banks */
        base[0] = gd->bd->bi_dram[0].start;
        size[0] = gd->bd->bi_dram[0].size;
@@ -287,20 +454,37 @@ int ft_board_setup(void *blob, bd_t *bd)
                size[1] = gd->arch.resv_ram - base[1];
 #endif
 
-       fdt_fixup_memory_banks(blob, base, size, 2);
+       if (mc_memory_base != 0) {
+               for (i = 0; i <= total_memory_banks; i++) {
+                       if (base[i] == 0 && size[i] == 0) {
+                               base[i] = mc_memory_base;
+                               size[i] = mc_memory_size;
+                               break;
+                       }
+               }
+       }
+
+       fdt_fixup_memory_banks(blob, base, size, total_memory_banks);
+
+       fdt_fsl_mc_fixup_iommu_map_entry(blob);
 
        fsl_fdt_fixup_dr_usb(blob, bd);
 
+       fsl_fdt_fixup_flash(blob);
+
 #ifdef CONFIG_FSL_MC_ENET
        fdt_fixup_board_enet(blob);
 #endif
 
+       fdt_fixup_icid(blob);
+
        return 0;
 }
 #endif
 
 void qixis_dump_switch(void)
 {
+#ifdef CONFIG_FSL_QIXIS
        int i, nr_of_cfgsw;
 
        QIXIS_WRITE(cms[0], 0x00);
@@ -311,6 +495,7 @@ void qixis_dump_switch(void)
                QIXIS_WRITE(cms[0], i);
                printf("SW%d = (0x%02x)\n", i, QIXIS_READ(cms[1]));
        }
+#endif
 }
 
 /*
@@ -321,6 +506,8 @@ void update_spd_address(unsigned int ctrl_num,
                        unsigned int slot,
                        unsigned int *addr)
 {
+#ifndef CONFIG_TARGET_LS2081ARDB
+#ifdef CONFIG_FSL_QIXIS
        u8 sw;
 
        sw = QIXIS_READ(arch);
@@ -330,4 +517,6 @@ void update_spd_address(unsigned int ctrl_num,
                else if (ctrl_num == 1 && slot == 1)
                        *addr = SPD_EEPROM_ADDRESS3;
        }
+#endif
+#endif
 }