aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-10-03 04:05:32 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-10-03 04:05:31 -0700
commitd11fbd3357f452b38c550e6343ac6b4fcd10751f (patch)
tree2a6e5c57fe0f7cd6a0602e20e8c5d877dc5daf15
parent22f9a6357df1088aab8eee05e4c9ce016f791bf0 (diff)
parentd2178545be7d562ef901de61a215d6a3b3137b6f (diff)
Merge "msm: 8084: Clock configs for QCA1530 interface"
-rw-r--r--arch/arm/mach-msm/clock-8084.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/clock-8084.c b/arch/arm/mach-msm/clock-8084.c
index 805a6d8b232..8e5975dba62 100644
--- a/arch/arm/mach-msm/clock-8084.c
+++ b/arch/arm/mach-msm/clock-8084.c
@@ -5875,6 +5875,7 @@ static struct clk_lookup apq_clocks_8084[] = {
CLK_LOOKUP("core_clk", gcc_blsp1_uart6_apps_clk.c, "f9922000.uart"),
/* BLSP2 clocks */
+ CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f995d000.uart"),
CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f995e000.serial"),
CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f9966000.i2c"),
CLK_LOOKUP("", gcc_blsp2_qup1_i2c_apps_clk.c, ""),
@@ -5890,10 +5891,12 @@ static struct clk_lookup apq_clocks_8084[] = {
CLK_LOOKUP("", gcc_blsp2_qup6_i2c_apps_clk.c, ""),
CLK_LOOKUP("", gcc_blsp2_qup6_spi_apps_clk.c, ""),
CLK_LOOKUP("", gcc_blsp2_uart1_apps_clk.c, ""),
+ CLK_LOOKUP("core_clk", gcc_blsp2_uart1_apps_clk.c, "f995d000.uart"),
CLK_LOOKUP("core_clk", gcc_blsp2_uart2_apps_clk.c, "f995e000.serial"),
CLK_LOOKUP("", gcc_blsp2_uart3_apps_clk.c, ""),
CLK_LOOKUP("", gcc_blsp2_uart4_apps_clk.c, ""),
- CLK_LOOKUP("", gcc_blsp2_uart5_apps_clk.c, ""),
+ CLK_LOOKUP("iface_clk", gcc_blsp2_ahb_clk.c, "f9961000.uart"),
+ CLK_LOOKUP("core_clk", gcc_blsp2_uart5_apps_clk.c, "f9961000.uart"),
CLK_LOOKUP("", gcc_blsp2_uart6_apps_clk.c, ""),
CLK_LOOKUP("", gcc_boot_rom_ahb_clk.c, ""),