xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clk-qcom' into clk-next

Browse Source 
* clk-qcom:
  clk: qcom: gcc: Make disp gpll0 branch aon for sc7180/sdm845
  ipq806x: gcc: add support for child probe
  clk: qcom: msm8996: Make symbol 'cpu_msm8996_clks' static
  clk: qcom: ipq8074: Add correct index for PCIe clocks
This commit is contained in:
Stephen Boyd
2020-07-21 00:55:21 -07:00
parent 46e3ecda63 9c3df2b199
commit 73d6bd7acb
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/qcom/clk-cpu-8996.c
View File

@@ -338,7 +338,7 @@ static const struct regmap_config cpu_msm8996_regmap_config = {
.val_format_endian = REGMAP_ENDIAN_LITTLE, .val_format_endian = REGMAP_ENDIAN_LITTLE,
}; };
struct clk_regmap *cpu_msm8996_clks[] = { static struct clk_regmap *cpu_msm8996_clks[] = {
&perfcl_pll.clkr, &perfcl_pll.clkr,
&pwrcl_pll.clkr, &pwrcl_pll.clkr,
&perfcl_alt_pll.clkr, &perfcl_alt_pll.clkr,

2
drivers/clk/qcom/gcc-ipq806x.c
View File

@@ -3089,7 +3089,7 @@ static int gcc_ipq806x_probe(struct platform_device *pdev)
regmap_write(regmap, 0x3cf8, 8); regmap_write(regmap, 0x3cf8, 8);
regmap_write(regmap, 0x3d18, 8); regmap_write(regmap, 0x3d18, 8);
return 0; return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
} }
static struct platform_driver gcc_ipq806x_driver = { static struct platform_driver gcc_ipq806x_driver = {

2
drivers/clk/qcom/gcc-sc7180.c
View File

@@ -1061,7 +1061,7 @@ static struct clk_branch gcc_disp_gpll0_clk_src = {
.hw = &gpll0.clkr.hw, .hw = &gpll0.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_aon_ops,
}, },
}, },
}; };

4
drivers/clk/qcom/gcc-sdm845.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Copyright (c) 2018, The Linux Foundation. All rights reserved. * Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@@ -1344,7 +1344,7 @@ static struct clk_branch gcc_disp_gpll0_clk_src = {
"gpll0", "gpll0",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_aon_ops,
}, },
}, },
}; };

6
include/dt-bindings/clock/qcom,gcc-ipq8074.h
View File

@@ -230,6 +230,9 @@
#define GCC_GP1_CLK 221 #define GCC_GP1_CLK 221
#define GCC_GP2_CLK 222 #define GCC_GP2_CLK 222
#define GCC_GP3_CLK 223 #define GCC_GP3_CLK 223
#define GCC_PCIE0_AXI_S_BRIDGE_CLK 224
#define GCC_PCIE0_RCHNG_CLK_SRC 225
#define GCC_PCIE0_RCHNG_CLK 226
#define GCC_BLSP1_BCR 0 #define GCC_BLSP1_BCR 0
#define GCC_BLSP1_QUP1_BCR 1 #define GCC_BLSP1_QUP1_BCR 1
@@ -363,8 +366,5 @@
#define GCC_PCIE1_AHB_ARES 129 #define GCC_PCIE1_AHB_ARES 129
#define GCC_PCIE1_AXI_MASTER_STICKY_ARES 130 #define GCC_PCIE1_AXI_MASTER_STICKY_ARES 130
#define GCC_PCIE0_AXI_SLAVE_STICKY_ARES 131 #define GCC_PCIE0_AXI_SLAVE_STICKY_ARES 131
#define GCC_PCIE0_AXI_S_BRIDGE_CLK 132
#define GCC_PCIE0_RCHNG_CLK_SRC 133
#define GCC_PCIE0_RCHNG_CLK 134
#endif #endif