]> git.sur5r.net Git - u-boot/blobdiff - drivers/ram/stm32_sdram.c
Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR
[u-boot] / drivers / ram / stm32_sdram.c
index 9b2cec4886f67453f06880adcda17be0dfe0442f..62282c613860e244fd8d7c88c8d015e139eb1bfe 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * (C) Copyright 2017
- * Vikas Manocha, <vikas.manocha@st.com>
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -11,7 +11,8 @@
 #include <ram.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
+#define MEM_MODE_MASK  GENMASK(2, 0)
+#define NOT_FOUND      0xff
 
 struct stm32_fmc_regs {
        /* 0x0 */
@@ -54,6 +55,12 @@ struct stm32_fmc_regs {
        u32 sdsr;       /* SDRAM Status register */
 };
 
+/*
+ * NOR/PSRAM Control register BCR1
+ * FMC controller Enable, only availabe for H7
+ */
+#define FMC_BCR1_FMCEN         BIT(31)
+
 /* Control register SDCR */
 #define FMC_SDCR_RPIPE_SHIFT   13      /* RPIPE bit shift */
 #define FMC_SDCR_RBURST_SHIFT  12      /* RBURST bit shift */
@@ -117,12 +124,29 @@ struct stm32_sdram_timing {
        u8 twr;
        u8 trcd;
 };
+enum stm32_fmc_bank {
+       SDRAM_BANK1,
+       SDRAM_BANK2,
+       MAX_SDRAM_BANK,
+};
+
+enum stm32_fmc_family {
+       STM32F7_FMC,
+       STM32H7_FMC,
+};
+
+struct bank_params {
+       struct stm32_sdram_control *sdram_control;
+       struct stm32_sdram_timing *sdram_timing;
+       u32 sdram_ref_count;
+       enum stm32_fmc_bank target_bank;
+};
+
 struct stm32_sdram_params {
        struct stm32_fmc_regs *base;
        u8 no_sdram_banks;
-       struct stm32_sdram_control sdram_control;
-       struct stm32_sdram_timing sdram_timing;
-       u32 sdram_ref_count;
+       struct bank_params bank_params[MAX_SDRAM_BANK];
+       enum stm32_fmc_family family;
 };
 
 #define SDRAM_MODE_BL_SHIFT    0
@@ -132,85 +156,185 @@ struct stm32_sdram_params {
 int stm32_sdram_init(struct udevice *dev)
 {
        struct stm32_sdram_params *params = dev_get_platdata(dev);
+       struct stm32_sdram_control *control;
+       struct stm32_sdram_timing *timing;
        struct stm32_fmc_regs *regs = params->base;
+       enum stm32_fmc_bank target_bank;
+       u32 ctb; /* SDCMR register: Command Target Bank */
+       u32 ref_count;
+       u8 i;
+
+       /* disable the FMC controller */
+       if (params->family == STM32H7_FMC)
+               clrbits_le32(&regs->bcr1, FMC_BCR1_FMCEN);
+
+       for (i = 0; i < params->no_sdram_banks; i++) {
+               control = params->bank_params[i].sdram_control;
+               timing = params->bank_params[i].sdram_timing;
+               target_bank = params->bank_params[i].target_bank;
+               ref_count = params->bank_params[i].sdram_ref_count;
+
+               writel(control->sdclk << FMC_SDCR_SDCLK_SHIFT
+                       | control->cas_latency << FMC_SDCR_CAS_SHIFT
+                       | control->no_banks << FMC_SDCR_NB_SHIFT
+                       | control->memory_width << FMC_SDCR_MWID_SHIFT
+                       | control->no_rows << FMC_SDCR_NR_SHIFT
+                       | control->no_columns << FMC_SDCR_NC_SHIFT
+                       | control->rd_pipe_delay << FMC_SDCR_RPIPE_SHIFT
+                       | control->rd_burst << FMC_SDCR_RBURST_SHIFT,
+                       &regs->sdcr1);
+
+               if (target_bank == SDRAM_BANK2)
+                       writel(control->cas_latency << FMC_SDCR_CAS_SHIFT
+                               | control->no_banks << FMC_SDCR_NB_SHIFT
+                               | control->memory_width << FMC_SDCR_MWID_SHIFT
+                               | control->no_rows << FMC_SDCR_NR_SHIFT
+                               | control->no_columns << FMC_SDCR_NC_SHIFT,
+                               &regs->sdcr2);
+
+               writel(timing->trcd << FMC_SDTR_TRCD_SHIFT
+                       | timing->trp << FMC_SDTR_TRP_SHIFT
+                       | timing->twr << FMC_SDTR_TWR_SHIFT
+                       | timing->trc << FMC_SDTR_TRC_SHIFT
+                       | timing->tras << FMC_SDTR_TRAS_SHIFT
+                       | timing->txsr << FMC_SDTR_TXSR_SHIFT
+                       | timing->tmrd << FMC_SDTR_TMRD_SHIFT,
+                       &regs->sdtr1);
+
+               if (target_bank == SDRAM_BANK2)
+                       writel(timing->trcd << FMC_SDTR_TRCD_SHIFT
+                               | timing->trp << FMC_SDTR_TRP_SHIFT
+                               | timing->twr << FMC_SDTR_TWR_SHIFT
+                               | timing->trc << FMC_SDTR_TRC_SHIFT
+                               | timing->tras << FMC_SDTR_TRAS_SHIFT
+                               | timing->txsr << FMC_SDTR_TXSR_SHIFT
+                               | timing->tmrd << FMC_SDTR_TMRD_SHIFT,
+                               &regs->sdtr2);
+
+               if (target_bank == SDRAM_BANK1)
+                       ctb = FMC_SDCMR_BANK_1;
+               else
+                       ctb = FMC_SDCMR_BANK_2;
+
+               writel(ctb | FMC_SDCMR_MODE_START_CLOCK, &regs->sdcmr);
+               udelay(200);    /* 200 us delay, page 10, "Power-Up" */
+               FMC_BUSY_WAIT(regs);
+
+               writel(ctb | FMC_SDCMR_MODE_PRECHARGE, &regs->sdcmr);
+               udelay(100);
+               FMC_BUSY_WAIT(regs);
+
+               writel((ctb | FMC_SDCMR_MODE_AUTOREFRESH | 7 << FMC_SDCMR_NRFS_SHIFT),
+                      &regs->sdcmr);
+               udelay(100);
+               FMC_BUSY_WAIT(regs);
+
+               writel(ctb | (SDRAM_MODE_BL << SDRAM_MODE_BL_SHIFT
+                      | control->cas_latency << SDRAM_MODE_CAS_SHIFT)
+                      << FMC_SDCMR_MODE_REGISTER_SHIFT | FMC_SDCMR_MODE_WRITE_MODE,
+                      &regs->sdcmr);
+               udelay(100);
+               FMC_BUSY_WAIT(regs);
+
+               writel(ctb | FMC_SDCMR_MODE_NORMAL, &regs->sdcmr);
+               FMC_BUSY_WAIT(regs);
+
+               /* Refresh timer */
+               writel(ref_count << 1, &regs->sdrtr);
+       }
 
-       writel(params->sdram_control.sdclk << FMC_SDCR_SDCLK_SHIFT
-               | params->sdram_control.cas_latency << FMC_SDCR_CAS_SHIFT
-               | params->sdram_control.no_banks << FMC_SDCR_NB_SHIFT
-               | params->sdram_control.memory_width << FMC_SDCR_MWID_SHIFT
-               | params->sdram_control.no_rows << FMC_SDCR_NR_SHIFT
-               | params->sdram_control.no_columns << FMC_SDCR_NC_SHIFT
-               | params->sdram_control.rd_pipe_delay << FMC_SDCR_RPIPE_SHIFT
-               | params->sdram_control.rd_burst << FMC_SDCR_RBURST_SHIFT,
-               &regs->sdcr1);
-
-       writel(params->sdram_timing.trcd << FMC_SDTR_TRCD_SHIFT
-               | params->sdram_timing.trp << FMC_SDTR_TRP_SHIFT
-               | params->sdram_timing.twr << FMC_SDTR_TWR_SHIFT
-               | params->sdram_timing.trc << FMC_SDTR_TRC_SHIFT
-               | params->sdram_timing.tras << FMC_SDTR_TRAS_SHIFT
-               | params->sdram_timing.txsr << FMC_SDTR_TXSR_SHIFT
-               | params->sdram_timing.tmrd << FMC_SDTR_TMRD_SHIFT,
-               &regs->sdtr1);
-
-       writel(FMC_SDCMR_BANK_1 | FMC_SDCMR_MODE_START_CLOCK,
-              &regs->sdcmr);
-       udelay(200);    /* 200 us delay, page 10, "Power-Up" */
-       FMC_BUSY_WAIT(regs);
-
-       writel(FMC_SDCMR_BANK_1 | FMC_SDCMR_MODE_PRECHARGE,
-              &regs->sdcmr);
-       udelay(100);
-       FMC_BUSY_WAIT(regs);
-
-       writel((FMC_SDCMR_BANK_1 | FMC_SDCMR_MODE_AUTOREFRESH
-               | 7 << FMC_SDCMR_NRFS_SHIFT), &regs->sdcmr);
-       udelay(100);
-       FMC_BUSY_WAIT(regs);
-
-       writel(FMC_SDCMR_BANK_1 | (SDRAM_MODE_BL << SDRAM_MODE_BL_SHIFT
-              | params->sdram_control.cas_latency << SDRAM_MODE_CAS_SHIFT)
-              << FMC_SDCMR_MODE_REGISTER_SHIFT | FMC_SDCMR_MODE_WRITE_MODE,
-              &regs->sdcmr);
-       udelay(100);
-       FMC_BUSY_WAIT(regs);
-
-       writel(FMC_SDCMR_BANK_1 | FMC_SDCMR_MODE_NORMAL,
-              &regs->sdcmr);
-       FMC_BUSY_WAIT(regs);
-
-       /* Refresh timer */
-       writel((params->sdram_ref_count) << 1, &regs->sdrtr);
+       /* enable the FMC controller */
+       if (params->family == STM32H7_FMC)
+               setbits_le32(&regs->bcr1, FMC_BCR1_FMCEN);
 
        return 0;
 }
 
 static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)
 {
-       int ret;
-       int node = dev_of_offset(dev);
-       const void *blob = gd->fdt_blob;
        struct stm32_sdram_params *params = dev_get_platdata(dev);
+       struct bank_params *bank_params;
+       struct ofnode_phandle_args args;
+       u32 *syscfg_base;
+       u32 mem_remap;
+       ofnode bank_node;
+       char *bank_name;
+       u8 bank = 0;
+       int ret;
 
-       params->no_sdram_banks = fdtdec_get_uint(blob, node, "mr-nbanks", 1);
-       debug("%s, no of banks = %d\n", __func__, params->no_sdram_banks);
-
-       fdt_for_each_subnode(node, blob, node) {
-               ret = fdtdec_get_byte_array(blob, node, "st,sdram-control",
-                                           (u8 *)&params->sdram_control,
-                                           sizeof(params->sdram_control));
-               if (ret)
-                       return ret;
-               ret = fdtdec_get_byte_array(blob, node, "st,sdram-timing",
-                                           (u8 *)&params->sdram_timing,
-                                           sizeof(params->sdram_timing));
-               if (ret)
+       mem_remap = dev_read_u32_default(dev, "st,mem_remap", NOT_FOUND);
+       if (mem_remap != NOT_FOUND) {
+               ret = dev_read_phandle_with_args(dev, "st,syscfg", NULL, 0, 0,
+                                                &args);
+               if (ret) {
+                       debug("%s: can't find syscon device (%d)\n", __func__,
+                             ret);
                        return ret;
+               }
 
-               params->sdram_ref_count = fdtdec_get_int(blob, node,
+               syscfg_base = (u32 *)ofnode_get_addr(args.node);
+
+               /* set memory mapping selection */
+               clrsetbits_le32(syscfg_base, MEM_MODE_MASK, mem_remap);
+       } else {
+               debug("%s: cannot find st,mem_remap property\n", __func__);
+       }
+
+       dev_for_each_subnode(bank_node, dev) {
+               /* extract the bank index from DT */
+               bank_name = (char *)ofnode_get_name(bank_node);
+               strsep(&bank_name, "@");
+               if (!bank_name) {
+                       pr_err("missing sdram bank index");
+                       return -EINVAL;
+               }
+
+               bank_params = &params->bank_params[bank];
+               strict_strtoul(bank_name, 10,
+                              (long unsigned int *)&bank_params->target_bank);
+
+               if (bank_params->target_bank >= MAX_SDRAM_BANK) {
+                       pr_err("Found bank %d , but only bank 0 and 1 are supported",
+                             bank_params->target_bank);
+                       return -EINVAL;
+               }
+
+               debug("Find bank %s %u\n", bank_name, bank_params->target_bank);
+
+               params->bank_params[bank].sdram_control =
+                       (struct stm32_sdram_control *)
+                        ofnode_read_u8_array_ptr(bank_node,
+                                                 "st,sdram-control",
+                                                 sizeof(struct stm32_sdram_control));
+
+               if (!params->bank_params[bank].sdram_control) {
+                       pr_err("st,sdram-control not found for %s",
+                             ofnode_get_name(bank_node));
+                       return -EINVAL;
+               }
+
+
+               params->bank_params[bank].sdram_timing =
+                       (struct stm32_sdram_timing *)
+                        ofnode_read_u8_array_ptr(bank_node,
+                                                 "st,sdram-timing",
+                                                 sizeof(struct stm32_sdram_timing));
+
+               if (!params->bank_params[bank].sdram_timing) {
+                       pr_err("st,sdram-timing not found for %s",
+                             ofnode_get_name(bank_node));
+                       return -EINVAL;
+               }
+
+
+               bank_params->sdram_ref_count = ofnode_read_u32_default(bank_node,
                                                "st,sdram-refcount", 8196);
+               bank++;
        }
 
+       params->no_sdram_banks = bank;
+       debug("%s, no of banks = %d\n", __func__, params->no_sdram_banks);
+
        return 0;
 }
 
@@ -225,6 +349,7 @@ static int stm32_fmc_probe(struct udevice *dev)
                return -EINVAL;
 
        params->base = (struct stm32_fmc_regs *)addr;
+       params->family = dev_get_driver_data(dev);
 
 #ifdef CONFIG_CLK
        struct clk clk;
@@ -257,7 +382,8 @@ static struct ram_ops stm32_fmc_ops = {
 };
 
 static const struct udevice_id stm32_fmc_ids[] = {
-       { .compatible = "st,stm32-fmc" },
+       { .compatible = "st,stm32-fmc", .data = STM32F7_FMC },
+       { .compatible = "st,stm32h7-fmc", .data = STM32H7_FMC },
        { }
 };