arm: omap5: Fix generation of reserved-memory DT node
[oweals/u-boot.git] / arch / arm / mach-omap2 / omap5 / fdt.c
index da8d59bb59f617712d3d0f6691fb8d1bbce88ba2..7a3a8db5179408bd7c06f6a8ebe8d2c7569494b6 100644 (file)
@@ -161,6 +161,7 @@ static int ft_hs_fixup_dram(void *fdt, bd_t *bd)
        u32 sec_mem_start = CONFIG_TI_SECURE_EMIF_REGION_START;
        u32 sec_mem_size = CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE;
        fdt64_t temp[2];
+       fdt32_t two;
 
        /* If start address is zero, place at end of DRAM */
        if (0 == sec_mem_start)
@@ -181,7 +182,7 @@ static int ft_hs_fixup_dram(void *fdt, bd_t *bd)
                debug("Node %s not found\n", path);
                path = "/";
                subpath = "reserved-memory";
-               fdt_path_offset(fdt, path);
+               offs = fdt_path_offset(fdt, path);
                offs = fdt_add_subnode(fdt, offs, subpath);
                if (offs < 0) {
                        printf("Could not create %s%s node.\n", path, subpath);
@@ -189,6 +190,10 @@ static int ft_hs_fixup_dram(void *fdt, bd_t *bd)
                }
                path = "/reserved-memory";
                offs = fdt_path_offset(fdt, path);
+               two = cpu_to_fdt32(2);
+               fdt_setprop(fdt, offs, "#address-cells", &two, sizeof(two));
+               fdt_setprop(fdt, offs, "#size-cells", &two, sizeof(two));
+               fdt_setprop(fdt, offs, "ranges", NULL, 0);
        }
 
        subpath = "secure_reserved";
@@ -212,6 +217,38 @@ static int ft_hs_fixup_dram(void *fdt, bd_t *bd)
 static int ft_hs_fixup_dram(void *fdt, bd_t *bd) { return 0; }
 #endif
 
+static int ft_hs_add_tee(void *fdt, bd_t *bd)
+{
+       const char *path, *subpath;
+       int offs;
+
+       extern int tee_loaded;
+       if (!tee_loaded)
+               return 0;
+
+       path = "/";
+       offs = fdt_path_offset(fdt, path);
+
+       subpath = "firmware";
+       offs = fdt_add_subnode(fdt, offs, subpath);
+       if (offs < 0) {
+               printf("Could not create %s node.\n", subpath);
+               return 1;
+       }
+
+       subpath = "optee";
+       offs = fdt_add_subnode(fdt, offs, subpath);
+       if (offs < 0) {
+               printf("Could not create %s node.\n", subpath);
+               return 1;
+       }
+
+       fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
+       fdt_setprop_string(fdt, offs, "method", "smc");
+
+       return 0;
+}
+
 static void ft_hs_fixups(void *fdt, bd_t *bd)
 {
        /* Check we are running on an HS/EMU device type */
@@ -219,7 +256,8 @@ static void ft_hs_fixups(void *fdt, bd_t *bd)
                if ((ft_hs_fixup_crossbar(fdt, bd) == 0) &&
                    (ft_hs_disable_rng(fdt, bd) == 0) &&
                    (ft_hs_fixup_sram(fdt, bd) == 0) &&
-                   (ft_hs_fixup_dram(fdt, bd) == 0))
+                   (ft_hs_fixup_dram(fdt, bd) == 0) &&
+                   (ft_hs_add_tee(fdt, bd) == 0))
                        return;
        } else {
                printf("ERROR: Incorrect device type (GP) detected!");
@@ -233,6 +271,141 @@ static void ft_hs_fixups(void *fdt, bd_t *bd)
 }
 #endif /* #ifdef CONFIG_TI_SECURE_DEVICE */
 
+#if defined(CONFIG_TARGET_DRA7XX_EVM) || defined(CONFIG_TARGET_AM57XX_EVM)
+#define OPP_DSP_CLK_NUM        3
+#define OPP_IVA_CLK_NUM        2
+#define OPP_GPU_CLK_NUM        2
+
+const char *dra7_opp_dsp_clk_names[OPP_DSP_CLK_NUM] = {
+       "dpll_dsp_ck",
+       "dpll_dsp_m2_ck",
+       "dpll_dsp_m3x2_ck",
+};
+
+const char *dra7_opp_iva_clk_names[OPP_IVA_CLK_NUM] = {
+       "dpll_iva_ck",
+       "dpll_iva_m2_ck",
+};
+
+const char *dra7_opp_gpu_clk_names[OPP_GPU_CLK_NUM] = {
+       "dpll_gpu_ck",
+       "dpll_gpu_m2_ck",
+};
+
+/* DSPEVE voltage domain */
+u32 dra7_opp_dsp_clk_rates[NUM_OPPS][OPP_DSP_CLK_NUM] = {
+       {}, /*OPP_LOW */
+       {600000000, 600000000, 400000000}, /* OPP_NOM */
+       {700000000, 700000000, 466666667}, /* OPP_OD */
+       {750000000, 750000000, 500000000}, /* OPP_HIGH */
+};
+
+/* IVA voltage domain */
+u32 dra7_opp_iva_clk_rates[NUM_OPPS][OPP_IVA_CLK_NUM] = {
+       {}, /* OPP_LOW */
+       {1165000000, 388333334}, /* OPP_NOM */
+       {860000000, 430000000}, /* OPP_OD */
+       {1064000000, 532000000}, /* OPP_HIGH */
+};
+
+/* GPU voltage domain */
+u32 dra7_opp_gpu_clk_rates[NUM_OPPS][OPP_GPU_CLK_NUM] = {
+       {}, /* OPP_LOW */
+       {1277000000, 425666667}, /* OPP_NOM */
+       {1000000000, 500000000}, /* OPP_OD */
+       {1064000000, 532000000}, /* OPP_HIGH */
+};
+
+static int ft_fixup_clocks(void *fdt, const char **names, u32 *rates, int num)
+{
+       int offs, node_offs, ret, i;
+       uint32_t phandle;
+
+       offs = fdt_path_offset(fdt, "/ocp/l4@4a000000/cm_core_aon@5000/clocks");
+       if (offs < 0) {
+               debug("Could not find cm_core_aon clocks node path offset : %s\n",
+                     fdt_strerror(offs));
+               return offs;
+       }
+
+       for (i = 0; i < num; i++) {
+               node_offs = fdt_subnode_offset(fdt, offs, names[i]);
+               if (node_offs < 0) {
+                       debug("Could not find clock sub-node %s: %s\n",
+                             names[i], fdt_strerror(node_offs));
+                       return offs;
+               }
+
+               phandle = fdt_get_phandle(fdt, node_offs);
+               if (!phandle) {
+                       debug("Could not find phandle for clock %s\n",
+                             names[i]);
+                       return -1;
+               }
+
+               ret = fdt_setprop_u32(fdt, node_offs, "assigned-clocks",
+                                     phandle);
+               if (ret < 0) {
+                       debug("Could not add assigned-clocks property to clock node %s: %s\n",
+                             names[i], fdt_strerror(ret));
+                       return ret;
+               }
+
+               ret = fdt_setprop_u32(fdt, node_offs, "assigned-clock-rates",
+                                     rates[i]);
+               if (ret < 0) {
+                       debug("Could not add assigned-clock-rates property to clock node %s: %s\n",
+                             names[i], fdt_strerror(ret));
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
+static void ft_opp_clock_fixups(void *fdt, bd_t *bd)
+{
+       const char **clk_names;
+       u32 *clk_rates;
+       int ret;
+
+       if (!is_dra72x() && !is_dra7xx())
+               return;
+
+       /* fixup DSP clocks */
+       clk_names = dra7_opp_dsp_clk_names;
+       clk_rates = dra7_opp_dsp_clk_rates[get_voltrail_opp(VOLT_EVE)];
+       ret = ft_fixup_clocks(fdt, clk_names, clk_rates, OPP_DSP_CLK_NUM);
+       if (ret) {
+               printf("ft_fixup_clocks failed for DSP voltage domain: %s\n",
+                      fdt_strerror(ret));
+               return;
+       }
+
+       /* fixup IVA clocks */
+       clk_names = dra7_opp_iva_clk_names;
+       clk_rates = dra7_opp_iva_clk_rates[get_voltrail_opp(VOLT_IVA)];
+       ret = ft_fixup_clocks(fdt, clk_names, clk_rates, OPP_IVA_CLK_NUM);
+       if (ret) {
+               printf("ft_fixup_clocks failed for IVA voltage domain: %s\n",
+                      fdt_strerror(ret));
+               return;
+       }
+
+       /* fixup GPU clocks */
+       clk_names = dra7_opp_gpu_clk_names;
+       clk_rates = dra7_opp_gpu_clk_rates[get_voltrail_opp(VOLT_GPU)];
+       ret = ft_fixup_clocks(fdt, clk_names, clk_rates, OPP_GPU_CLK_NUM);
+       if (ret) {
+               printf("ft_fixup_clocks failed for GPU voltage domain: %s\n",
+                      fdt_strerror(ret));
+               return;
+       }
+}
+#else
+static void ft_opp_clock_fixups(void *fdt, bd_t *bd) { }
+#endif /* CONFIG_TARGET_DRA7XX_EVM || CONFIG_TARGET_AM57XX_EVM */
+
 /*
  * Place for general cpu/SoC FDT fixups. Board specific
  * fixups should remain in the board files which is where
@@ -241,4 +414,5 @@ static void ft_hs_fixups(void *fdt, bd_t *bd)
 void ft_cpu_setup(void *fdt, bd_t *bd)
 {
        ft_hs_fixups(fdt, bd);
+       ft_opp_clock_fixups(fdt, bd);
 }