Skip to content

Commit c70bb27

Browse files
sgaud-quicsgaud-quic
committed
Merge remote-tracking branch tech/bsp/clk into qcom-next-staging
2 parents a5806cd + 11a139f commit c70bb27

3 files changed

Lines changed: 107 additions & 5 deletions

File tree

‎drivers/clk/qcom/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,14 @@ config QCS_GCC_8300
519519
QCS8300 devices.
520520
Say Y if you want to use peripheral devices such as UART,
521521
SPI, I2C, USB, SD/UFS, PCIe etc.
522+
config QCS_GCC_615
523+
tristate "QCS615 Global Clock Controller"
524+
depends on ARM64 || COMPILE_TEST
525+
select QCOM_GDSC
526+
help
527+
Support for the global clock controller on QCS615 devices.
528+
Say Y if you want to use multimedia devices or peripheral
529+
devices such as UART, SPI, I2C, USB, SD/eMMC, PCIe etc.
522530

523531
config QCS_GCC_615
524532
tristate "QCS615 Global Clock Controller"

‎drivers/clk/qcom/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ obj-$(CONFIG_QCM_DISPCC_2290) += dispcc-qcm2290.o
7676
obj-$(CONFIG_QCS_GCC_404) += gcc-qcs404.o
7777
obj-$(CONFIG_QCS_GCC_615) += gcc-qcs615.o
7878
obj-$(CONFIG_QCS_GCC_8300) += gcc-qcs8300.o
79+
obj-$(CONFIG_QCS_GCC_615) += gcc-qcs615.o
7980
obj-$(CONFIG_QCS_Q6SSTOP_404) += q6sstop-qcs404.o
8081
obj-$(CONFIG_QCS_TURING_404) += turingcc-qcs404.o
8182
obj-$(CONFIG_QDU_ECPRICC_1000) += ecpricc-qdu1000.o

‎drivers/clk/qcom/camcc-sa8775p.c‎

Lines changed: 98 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/pm_runtime.h>
1111
#include <linux/regmap.h>
1212

13-
#include <dt-bindings/clock/qcom,sa8775p-camcc.h>
13+
#include <dt-bindings/clock/qcom,qcs8300-camcc.h>
1414

1515
#include "clk-alpha-pll.h"
1616
#include "clk-branch.h"
@@ -1681,6 +1681,24 @@ static struct clk_branch cam_cc_sm_obs_clk = {
16811681
},
16821682
};
16831683

1684+
static struct clk_branch cam_cc_titan_top_accu_shift_clk = {
1685+
.halt_reg = 0x131f0,
1686+
.halt_check = BRANCH_HALT_VOTED,
1687+
.clkr = {
1688+
.enable_reg = 0x131f0,
1689+
.enable_mask = BIT(0),
1690+
.hw.init = &(const struct clk_init_data) {
1691+
.name = "cam_cc_titan_top_accu_shift_clk",
1692+
.parent_hws = (const struct clk_hw*[]) {
1693+
&cam_cc_xo_clk_src.clkr.hw,
1694+
},
1695+
.num_parents = 1,
1696+
.flags = CLK_SET_RATE_PARENT,
1697+
.ops = &clk_branch2_ops,
1698+
},
1699+
},
1700+
};
1701+
16841702
static struct gdsc cam_cc_titan_top_gdsc = {
16851703
.gdscr = 0x131bc,
16861704
.en_rest_wait_val = 0x2,
@@ -1775,6 +1793,7 @@ static struct clk_regmap *cam_cc_sa8775p_clocks[] = {
17751793
[CAM_CC_SLEEP_CLK_SRC] = &cam_cc_sleep_clk_src.clkr,
17761794
[CAM_CC_SLOW_AHB_CLK_SRC] = &cam_cc_slow_ahb_clk_src.clkr,
17771795
[CAM_CC_SM_OBS_CLK] = &cam_cc_sm_obs_clk.clkr,
1796+
[CAM_CC_TITAN_TOP_ACCU_SHIFT_CLK] = NULL,
17781797
[CAM_CC_XO_CLK_SRC] = &cam_cc_xo_clk_src.clkr,
17791798
[CAM_CC_QDSS_DEBUG_XO_CLK] = &cam_cc_qdss_debug_xo_clk.clkr,
17801799
};
@@ -1811,6 +1830,7 @@ static const struct qcom_cc_desc cam_cc_sa8775p_desc = {
18111830
};
18121831

18131832
static const struct of_device_id cam_cc_sa8775p_match_table[] = {
1833+
{ .compatible = "qcom,qcs8300-camcc" },
18141834
{ .compatible = "qcom,sa8775p-camcc" },
18151835
{ }
18161836
};
@@ -1841,10 +1861,83 @@ static int cam_cc_sa8775p_probe(struct platform_device *pdev)
18411861
clk_lucid_evo_pll_configure(&cam_cc_pll4, regmap, &cam_cc_pll4_config);
18421862
clk_lucid_evo_pll_configure(&cam_cc_pll5, regmap, &cam_cc_pll5_config);
18431863

1844-
/* Keep some clocks always enabled */
1845-
qcom_branch_set_clk_en(regmap, 0x13194); /* CAM_CC_CAMNOC_XO_CLK */
1846-
qcom_branch_set_clk_en(regmap, 0x131ec); /* CAM_CC_GDSC_CLK */
1847-
qcom_branch_set_clk_en(regmap, 0x13208); /* CAM_CC_SLEEP_CLK */
1864+
if (of_device_is_compatible(pdev->dev.of_node, "qcom,qcs8300-camcc")) {
1865+
cam_cc_camnoc_axi_clk_src.cmd_rcgr = 0x13154;
1866+
cam_cc_camnoc_axi_clk.halt_reg = 0x1316c;
1867+
cam_cc_camnoc_axi_clk.clkr.enable_reg = 0x1316c;
1868+
cam_cc_camnoc_dcd_xo_clk.halt_reg = 0x13174;
1869+
cam_cc_camnoc_dcd_xo_clk.clkr.enable_reg = 0x13174;
1870+
1871+
cam_cc_csi0phytimer_clk_src.cmd_rcgr = 0x15054;
1872+
cam_cc_csi1phytimer_clk_src.cmd_rcgr = 0x15078;
1873+
cam_cc_csi2phytimer_clk_src.cmd_rcgr = 0x15098;
1874+
cam_cc_csid_clk_src.cmd_rcgr = 0x13134;
1875+
1876+
cam_cc_mclk0_clk_src.cmd_rcgr = 0x15000;
1877+
cam_cc_mclk1_clk_src.cmd_rcgr = 0x1501c;
1878+
cam_cc_mclk2_clk_src.cmd_rcgr = 0x15038;
1879+
1880+
cam_cc_fast_ahb_clk_src.cmd_rcgr = 0x13104;
1881+
cam_cc_slow_ahb_clk_src.cmd_rcgr = 0x1311c;
1882+
cam_cc_xo_clk_src.cmd_rcgr = 0x131b8;
1883+
cam_cc_sleep_clk_src.cmd_rcgr = 0x131d4;
1884+
1885+
cam_cc_core_ahb_clk.halt_reg = 0x131b4;
1886+
cam_cc_core_ahb_clk.clkr.enable_reg = 0x131b4;
1887+
1888+
cam_cc_cpas_ahb_clk.halt_reg = 0x130f4;
1889+
cam_cc_cpas_ahb_clk.clkr.enable_reg = 0x130f4;
1890+
cam_cc_cpas_fast_ahb_clk.halt_reg = 0x130fc;
1891+
cam_cc_cpas_fast_ahb_clk.clkr.enable_reg = 0x130fc;
1892+
1893+
cam_cc_csi0phytimer_clk.halt_reg = 0x1506c;
1894+
cam_cc_csi0phytimer_clk.clkr.enable_reg = 0x1506c;
1895+
cam_cc_csi1phytimer_clk.halt_reg = 0x15090;
1896+
cam_cc_csi1phytimer_clk.clkr.enable_reg = 0x15090;
1897+
cam_cc_csi2phytimer_clk.halt_reg = 0x150b0;
1898+
cam_cc_csi2phytimer_clk.clkr.enable_reg = 0x150b0;
1899+
cam_cc_csid_clk.halt_reg = 0x1314c;
1900+
cam_cc_csid_clk.clkr.enable_reg = 0x1314c;
1901+
cam_cc_csid_csiphy_rx_clk.halt_reg = 0x15074;
1902+
cam_cc_csid_csiphy_rx_clk.clkr.enable_reg = 0x15074;
1903+
cam_cc_csiphy0_clk.halt_reg = 0x15070;
1904+
cam_cc_csiphy0_clk.clkr.enable_reg = 0x15070;
1905+
cam_cc_csiphy1_clk.halt_reg = 0x15094;
1906+
cam_cc_csiphy1_clk.clkr.enable_reg = 0x15094;
1907+
cam_cc_csiphy2_clk.halt_reg = 0x150b4;
1908+
cam_cc_csiphy2_clk.clkr.enable_reg = 0x150b4;
1909+
1910+
cam_cc_mclk0_clk.halt_reg = 0x15018;
1911+
cam_cc_mclk0_clk.clkr.enable_reg = 0x15018;
1912+
cam_cc_mclk1_clk.halt_reg = 0x15034;
1913+
cam_cc_mclk1_clk.clkr.enable_reg = 0x15034;
1914+
cam_cc_mclk2_clk.halt_reg = 0x15050;
1915+
cam_cc_mclk2_clk.clkr.enable_reg = 0x15050;
1916+
cam_cc_qdss_debug_xo_clk.halt_reg = 0x1319c;
1917+
cam_cc_qdss_debug_xo_clk.clkr.enable_reg = 0x1319c;
1918+
1919+
cam_cc_titan_top_gdsc.gdscr = 0x131a0;
1920+
1921+
cam_cc_sa8775p_clocks[CAM_CC_CCI_3_CLK] = NULL;
1922+
cam_cc_sa8775p_clocks[CAM_CC_CCI_3_CLK_SRC] = NULL;
1923+
cam_cc_sa8775p_clocks[CAM_CC_CSI3PHYTIMER_CLK] = NULL;
1924+
cam_cc_sa8775p_clocks[CAM_CC_CSI3PHYTIMER_CLK_SRC] = NULL;
1925+
cam_cc_sa8775p_clocks[CAM_CC_CSIPHY3_CLK] = NULL;
1926+
cam_cc_sa8775p_clocks[CAM_CC_MCLK3_CLK] = NULL;
1927+
cam_cc_sa8775p_clocks[CAM_CC_MCLK3_CLK_SRC] = NULL;
1928+
cam_cc_sa8775p_clocks[CAM_CC_TITAN_TOP_ACCU_SHIFT_CLK] =
1929+
&cam_cc_titan_top_accu_shift_clk.clkr;
1930+
1931+
/* Keep some clocks always enabled */
1932+
qcom_branch_set_clk_en(regmap, 0x13178); /* CAM_CC_CAMNOC_XO_CLK */
1933+
qcom_branch_set_clk_en(regmap, 0x131d0); /* CAM_CC_GDSC_CLK */
1934+
qcom_branch_set_clk_en(regmap, 0x131ec); /* CAM_CC_SLEEP_CLK */
1935+
} else {
1936+
/* Keep some clocks always enabled */
1937+
qcom_branch_set_clk_en(regmap, 0x13194); /* CAM_CC_CAMNOC_XO_CLK */
1938+
qcom_branch_set_clk_en(regmap, 0x131ec); /* CAM_CC_GDSC_CLK */
1939+
qcom_branch_set_clk_en(regmap, 0x13208); /* CAM_CC_SLEEP_CLK */
1940+
}
18481941

18491942
ret = qcom_cc_really_probe(&pdev->dev, &cam_cc_sa8775p_desc, regmap);
18501943

0 commit comments

Comments
 (0)