Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "clk: qcom: gcc-8952: Remove div_clk1 and add div_clk2 clock"

This commit is contained in:
Linux Build Service Account 2015-04-25 12:17:50 -07:00 committed by Gerrit - the friendly Code Review server
parent 4f5db8ab66 4e8e16fc7c
commit 362e9aa3a1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/clk/qcom/clock-gcc-8952.c
View File

@ -173,7 +173,7 @@ DEFINE_CLK_RPM_SMD_QDSS(qdss_clk, qdss_a_clk, RPM_MISC_CLK_TYPE, QDSS_CLK_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER(bb_clk1, bb_clk1_a, BB_CLK1_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER(bb_clk2, bb_clk2_a, BB_CLK2_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER(rf_clk2, rf_clk2_a, RF_CLK2_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER(div_clk1, div_clk1_a, DIV_CLK1_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER(div_clk2, div_clk2_a, DIV_CLK2_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk1_pin, bb_clk1_a_pin, BB_CLK1_ID);
DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(bb_clk2_pin, bb_clk2_a_pin, BB_CLK2_ID);
@ -3112,8 +3112,8 @@ static struct clk_lookup msm_clocks_lookup[] = {
CLK_LIST(bb_clk2_a),
CLK_LIST(rf_clk2),
CLK_LIST(rf_clk2_a),
CLK_LIST(div_clk1),
CLK_LIST(div_clk1_a),
CLK_LIST(div_clk2),
CLK_LIST(div_clk2_a),
CLK_LIST(bb_clk1_pin),
CLK_LIST(bb_clk1_a_pin),

2
include/dt-bindings/clock/msm-clocks-8952.h
View File

@ -276,6 +276,8 @@
#define clk_rf_clk2_a_pin 0x2d75eb4d
#define clk_div_clk1 0xaa1157a6
#define clk_div_clk1_a 0x6b943d68
#define clk_div_clk2 0xd454019f
#define clk_div_clk2_a 0x4bd7bfa8
#define clk_ln_bb_clk 0x3ab0b36d
#define clk_ln_bb_a_clk 0xc7257ea8