Merge git://git.denx.de/u-boot-imx
[oweals/u-boot.git] / board / freescale / ls1012aqds / ls1012aqds.c
index 71eea82a0358a487d5077fd12d3363ce48c82fb1..4577917e8d2fa387b80c17c22da4b17ad5ded613 100644 (file)
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
+#ifdef CONFIG_FSL_LS_PPA
+#include <asm/arch/ppa.h>
+#endif
 #include <asm/arch/fdt.h>
+#include <asm/arch/mmu.h>
 #include <asm/arch/soc.h>
 #include <ahci.h>
 #include <hwconfig.h>
 #include <mmc.h>
 #include <scsi.h>
 #include <fm_eth.h>
-#include <fsl_csu.h>
 #include <fsl_esdhc.h>
 #include <fsl_mmdc.h>
 #include <spl.h>
 #include <netdev.h>
-
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
+#include "ls1012aqds_pfe.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void set_wait_for_bits_clear(void *ptr, u32 value, u32 bits)
-{
-       int timeout = 1000;
-
-       out_be32(ptr, value);
-
-       while (in_be32(ptr) & bits) {
-               udelay(100);
-               timeout--;
-       }
-       if (timeout <= 0)
-               puts("Error: wait for clear timeout.\n");
-}
-
 int checkboard(void)
 {
        char buf[64];
@@ -67,113 +56,31 @@ int checkboard(void)
        return 0;
 }
 
-void mmdc_init(void)
-{
-       struct mmdc_p_regs *mmdc =
-               (struct mmdc_p_regs *)CONFIG_SYS_FSL_DDR_ADDR;
-
-       out_be32(&mmdc->mdscr, CONFIGURATION_REQ);
-
-       /* configure timing parms */
-       out_be32(&mmdc->mdotc,  CONFIG_SYS_MMDC_CORE_ODT_TIMING);
-       out_be32(&mmdc->mdcfg0, CONFIG_SYS_MMDC_CORE_TIMING_CFG_0);
-       out_be32(&mmdc->mdcfg1, CONFIG_SYS_MMDC_CORE_TIMING_CFG_1);
-       out_be32(&mmdc->mdcfg2, CONFIG_SYS_MMDC_CORE_TIMING_CFG_2);
-
-       /* other parms  */
-       out_be32(&mmdc->mdmisc,    CONFIG_SYS_MMDC_CORE_MISC);
-       out_be32(&mmdc->mpmur0,    CONFIG_SYS_MMDC_PHY_MEASURE_UNIT);
-       out_be32(&mmdc->mdrwd,     CONFIG_SYS_MMDC_CORE_RDWR_CMD_DELAY);
-       out_be32(&mmdc->mpodtctrl, CONFIG_SYS_MMDC_PHY_ODT_CTRL);
-
-       /* out of reset delays */
-       out_be32(&mmdc->mdor,  CONFIG_SYS_MMDC_CORE_OUT_OF_RESET_DELAY);
-
-       /* physical parms */
-       out_be32(&mmdc->mdctl, CONFIG_SYS_MMDC_CORE_CONTROL_1);
-       out_be32(&mmdc->mdasp, CONFIG_SYS_MMDC_CORE_ADDR_PARTITION);
-
-       /* Enable MMDC */
-       out_be32(&mmdc->mdctl, CONFIG_SYS_MMDC_CORE_CONTROL_2);
-
-       /* dram init sequence: update MRs */
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x8) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_2));
-       out_be32(&mmdc->mdscr, (CONFIGURATION_REQ | CMD_LOAD_MODE_REG |
-                               CMD_BANK_ADDR_3));
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x4) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_1));
-       out_be32(&mmdc->mdscr, (CMD_ADDR_MSB_MR_OP(0x19) |
-                               CMD_ADDR_LSB_MR_ADDR(0x30) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_0));
-
-       /* dram init sequence: ZQCL */
-       out_be32(&mmdc->mdscr, (CMD_ADDR_MSB_MR_OP(0x4) | CONFIGURATION_REQ |
-                               CMD_ZQ_CALIBRATION | CMD_BANK_ADDR_0));
-       set_wait_for_bits_clear(&mmdc->mpzqhwctrl,
-                               CONFIG_SYS_MMDC_PHY_ZQ_HW_CTRL,
-                               FORCE_ZQ_AUTO_CALIBRATION);
-
-       /* Calibrations now: wr lvl */
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x84) |
-                               CONFIGURATION_REQ | CMD_LOAD_MODE_REG |
-                               CMD_BANK_ADDR_1));
-       out_be32(&mmdc->mdscr, (CONFIGURATION_REQ | WL_EN | CMD_NORMAL));
-       set_wait_for_bits_clear(&mmdc->mpwlgcr, WR_LVL_HW_EN, WR_LVL_HW_EN);
-
-       mdelay(1);
-
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x4) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_1));
-       out_be32(&mmdc->mdscr, CONFIGURATION_REQ);
-
-       mdelay(1);
-
-       /* Calibrations now: Read DQS gating calibration */
-       out_be32(&mmdc->mdscr, (CMD_ADDR_MSB_MR_OP(0x4) | CONFIGURATION_REQ |
-                               CMD_PRECHARGE_BANK_OPEN | CMD_BANK_ADDR_0));
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x4) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_3));
-       out_be32(&mmdc->mppdcmpr2, MPR_COMPARE_EN);
-       out_be32(&mmdc->mprddlctl, CONFIG_SYS_MMDC_PHY_RD_DLY_LINES_CFG);
-       set_wait_for_bits_clear(&mmdc->mpdgctrl0,
-                               AUTO_RD_DQS_GATING_CALIBRATION_EN,
-                               AUTO_RD_DQS_GATING_CALIBRATION_EN);
-
-       out_be32(&mmdc->mdscr, (CONFIGURATION_REQ | CMD_LOAD_MODE_REG |
-                               CMD_BANK_ADDR_3));
-
-       /* Calibrations now: Read calibration */
-       out_be32(&mmdc->mdscr, (CMD_ADDR_MSB_MR_OP(0x4) | CONFIGURATION_REQ |
-                               CMD_PRECHARGE_BANK_OPEN | CMD_BANK_ADDR_0));
-       out_be32(&mmdc->mdscr, (CMD_ADDR_LSB_MR_ADDR(0x4) | CONFIGURATION_REQ |
-                               CMD_LOAD_MODE_REG | CMD_BANK_ADDR_3));
-       out_be32(&mmdc->mppdcmpr2,  MPR_COMPARE_EN);
-       set_wait_for_bits_clear(&mmdc->mprddlhwctl,
-                               AUTO_RD_CALIBRATION_EN,
-                               AUTO_RD_CALIBRATION_EN);
-
-       out_be32(&mmdc->mdscr, (CONFIGURATION_REQ | CMD_LOAD_MODE_REG |
-                               CMD_BANK_ADDR_3));
-
-       /* PD, SR */
-       out_be32(&mmdc->mdpdc, CONFIG_SYS_MMDC_CORE_PWR_DOWN_CTRL);
-       out_be32(&mmdc->mapsr, CONFIG_SYS_MMDC_CORE_PWR_SAV_CTRL_STAT);
-
-       /* refresh scheme */
-       set_wait_for_bits_clear(&mmdc->mdref,
-                               CONFIG_SYS_MMDC_CORE_REFRESH_CTL,
-                               START_REFRESH);
-
-       /* disable CON_REQ */
-       out_be32(&mmdc->mdscr, DISABLE_CFG_REQ);
-}
-
 int dram_init(void)
 {
-       mmdc_init();
+       static const struct fsl_mmdc_info mparam = {
+               0x05180000,     /* mdctl */
+               0x00030035,     /* mdpdc */
+               0x12554000,     /* mdotc */
+               0xbabf7954,     /* mdcfg0 */
+               0xdb328f64,     /* mdcfg1 */
+               0x01ff00db,     /* mdcfg2 */
+               0x00001680,     /* mdmisc */
+               0x0f3c8000,     /* mdref */
+               0x00002000,     /* mdrwd */
+               0x00bf1023,     /* mdor */
+               0x0000003f,     /* mdasp */
+               0x0000022a,     /* mpodtctrl */
+               0xa1390003,     /* mpzqhwctrl */
+       };
+
+       mmdc_init(&mparam);
 
        gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
+       /* This will break-before-make MMU for DDR */
+       update_early_mmu_table();
+#endif
 
        return 0;
 }
@@ -199,27 +106,143 @@ int misc_init_r(void)
 
 int board_init(void)
 {
-       struct ccsr_cci400 *cci = (struct ccsr_cci400 *)
-                                  CONFIG_SYS_CCI400_ADDR;
+       struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR +
+                                  CONFIG_SYS_CCI400_OFFSET);
 
        /* Set CCI-400 control override register to enable barrier
         * transaction */
        out_le32(&cci->ctrl_ord,
                 CCI400_CTRLORD_EN_BARRIER);
 
-#ifdef CONFIG_LAYERSCAPE_NS_ACCESS
-       enable_layerscape_ns_access();
+#ifdef CONFIG_SYS_FSL_ERRATUM_A010315
+       erratum_a010315();
 #endif
 
 #ifdef CONFIG_ENV_IS_NOWHERE
        gd->env_addr = (ulong)&default_environment[0];
 #endif
+
+#ifdef CONFIG_FSL_LS_PPA
+       ppa_init();
+#endif
+       return 0;
+}
+
+int esdhc_status_fixup(void *blob, const char *compat)
+{
+       char esdhc0_path[] = "/soc/esdhc@1560000";
+       char esdhc1_path[] = "/soc/esdhc@1580000";
+       u8 card_id;
+
+       do_fixup_by_path(blob, esdhc0_path, "status", "okay",
+                        sizeof("okay"), 1);
+
+       /*
+        * The Presence Detect 2 register detects the installation
+        * of cards in various PCI Express or SGMII slots.
+        *
+        * STAT_PRS2[7:5]: Specifies the type of card installed in the
+        * SDHC2 Adapter slot. 0b111 indicates no adapter is installed.
+        */
+       card_id = (QIXIS_READ(present2) & 0xe0) >> 5;
+
+       /* If no adapter is installed in SDHC2, disable SDHC2 */
+       if (card_id == 0x7)
+               do_fixup_by_path(blob, esdhc1_path, "status", "disabled",
+                                sizeof("disabled"), 1);
+       else
+               do_fixup_by_path(blob, esdhc1_path, "status", "okay",
+                                sizeof("okay"), 1);
+       return 0;
+}
+
+static int pfe_set_properties(void *set_blob, struct pfe_prop_val prop_val,
+                             char *enet_path, char *mdio_path)
+{
+       do_fixup_by_path(set_blob, enet_path, "fsl,gemac-bus-id",
+                        &prop_val.busid, PFE_PROP_LEN, 1);
+       do_fixup_by_path(set_blob, enet_path, "fsl,gemac-phy-id",
+                        &prop_val.phyid, PFE_PROP_LEN, 1);
+       do_fixup_by_path(set_blob, enet_path, "fsl,mdio-mux-val",
+                        &prop_val.mux_val, PFE_PROP_LEN, 1);
+       do_fixup_by_path(set_blob, enet_path, "phy-mode",
+                        prop_val.phy_mode, strlen(prop_val.phy_mode) + 1, 1);
+       do_fixup_by_path(set_blob, mdio_path, "fsl,mdio-phy-mask",
+                        &prop_val.phy_mask, PFE_PROP_LEN, 1);
        return 0;
 }
 
-int board_eth_init(bd_t *bis)
+static void fdt_fsl_fixup_of_pfe(void *blob)
 {
-       return pci_eth_init(bis);
+       int i = 0;
+       struct pfe_prop_val prop_val;
+       void *l_blob = blob;
+
+       struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+       unsigned int srds_s1 = in_be32(&gur->rcwsr[4]) &
+               FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_MASK;
+       srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
+
+       for (i = 0; i < NUM_ETH_NODE; i++) {
+               switch (srds_s1) {
+               case SERDES_1_G_PROTOCOL:
+                       if (i == 0) {
+                               prop_val.busid = cpu_to_fdt32(
+                                               ETH_1_1G_BUS_ID);
+                               prop_val.phyid = cpu_to_fdt32(
+                                               ETH_1_1G_PHY_ID);
+                               prop_val.mux_val = cpu_to_fdt32(
+                                               ETH_1_1G_MDIO_MUX);
+                               prop_val.phy_mask = cpu_to_fdt32(
+                                               ETH_1G_MDIO_PHY_MASK);
+                               prop_val.phy_mode = "sgmii";
+                               pfe_set_properties(l_blob, prop_val, ETH_1_PATH,
+                                                  ETH_1_MDIO);
+                       } else {
+                               prop_val.busid = cpu_to_fdt32(
+                                               ETH_2_1G_BUS_ID);
+                               prop_val.phyid = cpu_to_fdt32(
+                                               ETH_2_1G_PHY_ID);
+                               prop_val.mux_val = cpu_to_fdt32(
+                                               ETH_2_1G_MDIO_MUX);
+                               prop_val.phy_mask = cpu_to_fdt32(
+                                               ETH_1G_MDIO_PHY_MASK);
+                               prop_val.phy_mode = "rgmii";
+                               pfe_set_properties(l_blob, prop_val, ETH_2_PATH,
+                                                  ETH_2_MDIO);
+                       }
+               break;
+               case SERDES_2_5_G_PROTOCOL:
+                       if (i == 0) {
+                               prop_val.busid = cpu_to_fdt32(
+                                               ETH_1_2_5G_BUS_ID);
+                               prop_val.phyid = cpu_to_fdt32(
+                                               ETH_1_2_5G_PHY_ID);
+                               prop_val.mux_val = cpu_to_fdt32(
+                                               ETH_1_2_5G_MDIO_MUX);
+                               prop_val.phy_mask = cpu_to_fdt32(
+                                               ETH_2_5G_MDIO_PHY_MASK);
+                               prop_val.phy_mode = "sgmii-2500";
+                               pfe_set_properties(l_blob, prop_val, ETH_1_PATH,
+                                                  ETH_1_MDIO);
+                       } else {
+                               prop_val.busid = cpu_to_fdt32(
+                                               ETH_2_2_5G_BUS_ID);
+                               prop_val.phyid = cpu_to_fdt32(
+                                               ETH_2_2_5G_PHY_ID);
+                               prop_val.mux_val = cpu_to_fdt32(
+                                               ETH_2_2_5G_MDIO_MUX);
+                               prop_val.phy_mask = cpu_to_fdt32(
+                                               ETH_2_5G_MDIO_PHY_MASK);
+                               prop_val.phy_mode = "sgmii-2500";
+                               pfe_set_properties(l_blob, prop_val, ETH_2_PATH,
+                                                  ETH_2_MDIO);
+                       }
+               break;
+               default:
+                       printf("serdes:[%d]\n", srds_s1);
+               }
+       }
 }
 
 #ifdef CONFIG_OF_BOARD_SETUP
@@ -228,6 +251,7 @@ int ft_board_setup(void *blob, bd_t *bd)
        arch_fixup_fdt(blob);
 
        ft_cpu_setup(blob, bd);
+       fdt_fsl_fixup_of_pfe(blob);
 
        return 0;
 }