From 5bf9cd99a125fb46e4004ab43a3d2cd33f8a523e Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 26 Jan 2012 15:12:23 +0000 Subject: [PATCH] --- yaml --- r: 296088 b: refs/heads/master c: 76c2f6e513b3df8031dda383838da2a3820adbe3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/tegra2_emc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 399a52bcb866..4da985cd1e6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3391811c4294da42e412ec5f83a251caf05869a4 +refs/heads/master: 76c2f6e513b3df8031dda383838da2a3820adbe3 diff --git a/trunk/arch/arm/mach-tegra/tegra2_emc.c b/trunk/arch/arm/mach-tegra/tegra2_emc.c index 52df6ca36292..5070d833bdd1 100644 --- a/trunk/arch/arm/mach-tegra/tegra2_emc.c +++ b/trunk/arch/arm/mach-tegra/tegra2_emc.c @@ -284,16 +284,16 @@ static struct tegra_emc_pdata __devinit *tegra_emc_fill_pdata(struct platform_de pdata->tables = devm_kzalloc(&pdev->dev, sizeof(*pdata->tables), GFP_KERNEL); - pdata->tables[0].rate = clk_get_rate(c); + pdata->tables[0].rate = clk_get_rate(c) / 2 / 1000; for (i = 0; i < TEGRA_EMC_NUM_REGS; i++) pdata->tables[0].regs[i] = emc_readl(emc_reg_addr[i]); pdata->num_tables = 1; - khz = pdata->tables[0].rate / 1000; + khz = pdata->tables[0].rate; dev_info(&pdev->dev, "no tables provided, using %ld kHz emc, " - "%ld kHz mem\n", khz, khz/2); + "%ld kHz mem\n", khz * 2, khz); return pdata; }