shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-14 17:40:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk312x: correct clk_ddr rate

Browse Source 
Signed-off-by: 陈亮 <cl@rock-chips.com>
This commit is contained in:
陈亮
2014-09-18 02:32:51 -07:00
parent 7f087aa86d
commit eb7e8235cf
5 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk312x-clocks.dtsi
View File

@@ -1206,7 +1206,7 @@
#clock-cells = <0>;
rockchip,flags = <(CLK_GET_RATE_NOCACHE |
CLK_SET_RATE_NO_REPARENT)>;
rockchip,clkops-idx = <CLKOPS_RATE_DDR>;
rockchip,clkops-idx = <CLKOPS_RATE_DDR_DIV2>;
};
/* reg[7:2]: reserved */

10
arch/arm/mach-rockchip/ddr_freq.c
View File

@@ -28,6 +28,7 @@
#include <linux/rockchip/grf.h>
#include <linux/rockchip/iomap.h>
#include <linux/clk-private.h>
#include <linux/rockchip/cpu.h>
#include "../../../drivers/clk/rockchip/clk-pd.h"
#include "cpu_axi.h"
@@ -912,8 +913,13 @@ static int ddrfreq_scale_rate_for_dvfs(struct clk *clk, unsigned long rate)
real_rate *= MHZ;
if (!real_rate)
return -EAGAIN;
clk->parent->rate = clk->rate = real_rate;
if (cpu_is_rk312x()) {
clk->parent->rate = 2 * real_rate;
clk->rate = real_rate;
} else {
clk->rate = real_rate;
clk->parent->rate = real_rate;
}
return 0;
}

19
arch/arm/mach-rockchip/dvfs.c
View File

@@ -1028,9 +1028,10 @@ int dvfs_clk_enable_limit(struct dvfs_node *clk_dvfs_node, unsigned int min_rate
}
DVFS_DBG("%s:clk(%s) last_set_rate=%u; [min_rate, max_rate]=[%u, %u]\n",
__func__, __clk_get_name(clk_dvfs_node->clk), clk_dvfs_node->last_set_rate,
clk_dvfs_node->min_rate, clk_dvfs_node->max_rate);
DVFS_DBG("%s:clk(%s) last_set_rate=%lu; [min_rate, max_rate]=[%u, %u]\n",
__func__, __clk_get_name(clk_dvfs_node->clk),
clk_dvfs_node->last_set_rate,
clk_dvfs_node->min_rate, clk_dvfs_node->max_rate);
return 0;
}
@@ -1054,8 +1055,11 @@ int dvfs_clk_disable_limit(struct dvfs_node *clk_dvfs_node)
mutex_unlock(&clk_dvfs_node->vd->mutex);
}
DVFS_DBG("%s: clk(%s) last_set_rate=%u; [min_rate, max_rate]=[%u, %u]\n",
__func__, __clk_get_name(clk_dvfs_node->clk), clk_dvfs_node->last_set_rate, clk_dvfs_node->min_rate, clk_dvfs_node->max_rate);
DVFS_DBG("%s: clk(%s) last_set_rate=%lu; [min_rate, max_rate]=[%u, %u]\n",
__func__, __clk_get_name(clk_dvfs_node->clk),
clk_dvfs_node->last_set_rate,
clk_dvfs_node->min_rate, clk_dvfs_node->max_rate);
return 0;
}
EXPORT_SYMBOL(dvfs_clk_disable_limit);
@@ -1329,11 +1333,8 @@ static int dvfs_target(struct dvfs_node *clk_dvfs_node, unsigned long rate)
if (!clk)
return -EINVAL;
if (!clk_dvfs_node->enable_count){
DVFS_WARNING("%s:dvfs(%s) is disable\n",
__func__, clk_dvfs_node->name);
if (!clk_dvfs_node->enable_count)
return 0;
}
if (clk_dvfs_node->vd->volt_set_flag == DVFS_SET_VOLT_FAILURE) {
/* It means the last time set voltage error */

19
drivers/clk/rockchip/clk-ops.c
View File

@@ -476,6 +476,24 @@ const struct clk_ops clkops_rate_ddr = {
.determine_rate = clk_ddr_determine_rate,
};
static unsigned long clk_ddr_div2_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
/* Same as clk_core, we should NOT set clk_ddr's parent
* (dpll) rate directly as a side effect.
*/
struct clk *parent = __clk_get_parent(hw->clk);
return clk_divider_recalc_rate(hw, __clk_get_rate(parent))/2;
}
const struct clk_ops clkops_rate_ddr_div2 = {
.recalc_rate = clk_ddr_div2_recalc_rate,
.round_rate = clk_ddr_round_rate,
.set_rate = clk_ddr_set_rate,
.determine_rate = clk_ddr_determine_rate,
};
static unsigned long clk_3288_i2s_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
@@ -692,6 +710,7 @@ struct clk_ops_table rk_clkops_rate_table[] = {
{.index = CLKOPS_RATE_RK3288_USB480M, .clk_ops = &clkops_rate_3288_usb480m},
{.index = CLKOPS_RATE_RK3288_DCLK_LCDC0,.clk_ops = &clkops_rate_3288_dclk_lcdc0},
{.index = CLKOPS_RATE_RK3288_DCLK_LCDC1,.clk_ops = &clkops_rate_3288_dclk_lcdc1},
{.index = CLKOPS_RATE_DDR_DIV2, .clk_ops = &clkops_rate_ddr_div2},
{.index = CLKOPS_RATE_I2S, .clk_ops = NULL},
{.index = CLKOPS_RATE_CIFOUT, .clk_ops = NULL},
{.index = CLKOPS_RATE_UART, .clk_ops = NULL},

1
include/dt-bindings/clock/rockchip.h
View File

@@ -63,6 +63,7 @@
#define CLKOPS_RATE_RK3288_USB480M 15
#define CLKOPS_RATE_RK3288_DCLK_LCDC0 16
#define CLKOPS_RATE_RK3288_DCLK_LCDC1 17
#define CLKOPS_RATE_DDR_DIV2 18
#define CLKOPS_TABLE_END (~0)
/* pd id */