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

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

Browse Source
This commit is contained in:
lyz
2013-08-15 16:07:54 +08:00
parent 58ae34ce22 c1d207e7a4
commit ac71bfc49d
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk30/board-pmu-tps65910.c
View File

@@ -565,7 +565,7 @@ static struct regulator_init_data tps65910_ldo8 = {
.min_uV = 1000000,
.max_uV = 2500000,
.apply_uV = 1,
.always_on = 1,
// .always_on = 1,
.valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
.valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,

4
arch/arm/mach-rk3026/clock_data.c
View File

@@ -2864,8 +2864,8 @@ static void __init rk2928_clock_common_init(unsigned long gpll_rate, unsigned lo
clk_set_parent_nolock(&aclk_vepu, &codec_pll_clk);
clk_set_parent_nolock(&aclk_vdpu, &codec_pll_clk);
clk_set_rate_nolock(&aclk_vepu, 200 * MHZ);
clk_set_rate_nolock(&aclk_vdpu, 200 * MHZ);
clk_set_rate_nolock(&aclk_vepu, 400 * MHZ);
clk_set_rate_nolock(&aclk_vdpu, 400 * MHZ);
//gpu auto sel
//clk_set_parent_nolock(&clk_gpu_pre, &general_pll_clk);
clk_set_rate_nolock(&clk_gpu_pre, 133 * MHZ);

12
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -1441,6 +1441,7 @@ static int rk_camera_mclk_ctrl(int cif_idx, int on, int clk_rate)
{
int err = 0,cif;
struct rk_cif_clk *clk;
struct clk *cif_clk_out_div;
cif = cif_idx - RK29_CAM_PLATFORM_DEV_ID;
if ((cif<0)||(cif>1)) {
@@ -1474,10 +1475,17 @@ static int rk_camera_mclk_ctrl(int cif_idx, int on, int clk_rate)
clk_disable(clk->pd_cif);
clk->on = false;
if(cif){
err = clk_set_parent(clk->cif_clk_out, clk_get(NULL, "cif1_out_div"));
cif_clk_out_div = clk_get(NULL, "cif1_out_div");
err = clk_set_parent(clk->cif_clk_out,cif_clk_out_div);
}else{
err = clk_set_parent(clk->cif_clk_out, clk_get(NULL, "cif0_out_div"));
cif_clk_out_div = clk_get(NULL, "cif0_out_div");
if(IS_ERR_OR_NULL(cif_clk_out_div)){
cif_clk_out_div = clk_get(NULL, "cif_out_div");
}
err = clk_set_parent(clk->cif_clk_out, cif_clk_out_div);
}
if(err)
RKCAMERA_TR("WARNING %s_%s_%d: camera sensor mclk maybe not close, please check!!!\n", __FILE__, __FUNCTION__, __LINE__);
}
spin_unlock(&clk->lock);
rk_camera_clk_ctrl_end: