Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: qcom: gcc-qcs404: Add CDSP related clocks and resets

Add the clocks and resets need in order to control the Turing
remoteproc.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Bjorn Andersson and committed by
Stephen Boyd
8bc7a04b 9e98c678

+95
+90
drivers/clk/qcom/gcc-qcs404.c
··· 260 260 "core_bi_pll_test_se", 261 261 }; 262 262 263 + static const struct parent_map gcc_parent_map_16[] = { 264 + { P_XO, 0 }, 265 + { P_GPLL0_OUT_MAIN, 1 }, 266 + { P_GPLL0_OUT_AUX, 2 }, 267 + { P_CORE_BI_PLL_TEST_SE, 7 }, 268 + }; 269 + 270 + static const char * const gcc_parent_names_16[] = { 271 + "cxo", 272 + "gpll0_out_main", 273 + "gpll0_out_aux", 274 + "core_bi_pll_test_se", 275 + }; 276 + 263 277 static struct clk_fixed_factor cxo = { 264 278 .mult = 1, 265 279 .div = 1, ··· 1208 1194 }, 1209 1195 }; 1210 1196 1197 + static const struct freq_tbl ftbl_cdsp_bimc_clk_src[] = { 1198 + F(19200000, P_XO, 1, 0, 0), 1199 + F(133333333, P_GPLL0_OUT_MAIN, 6, 0, 0), 1200 + F(266666667, P_GPLL0_OUT_MAIN, 3, 0, 0), 1201 + F(320000000, P_GPLL0_OUT_MAIN, 2.5, 0, 0), 1202 + { } 1203 + }; 1204 + 1205 + static struct clk_rcg2 cdsp_bimc_clk_src = { 1206 + .cmd_rcgr = 0x5e010, 1207 + .mnd_width = 0, 1208 + .hid_width = 5, 1209 + .parent_map = gcc_parent_map_16, 1210 + .freq_tbl = ftbl_cdsp_bimc_clk_src, 1211 + .clkr.hw.init = &(struct clk_init_data) { 1212 + .name = "cdsp_bimc_clk_src", 1213 + .parent_names = gcc_parent_names_16, 1214 + .num_parents = 4, 1215 + .ops = &clk_rcg2_ops, 1216 + }, 1217 + }; 1218 + 1211 1219 static struct clk_branch gcc_apss_ahb_clk = { 1212 1220 .halt_reg = 0x4601c, 1213 1221 .halt_check = BRANCH_HALT_VOTED, ··· 1286 1250 .enable_mask = BIT(0), 1287 1251 .hw.init = &(struct clk_init_data){ 1288 1252 .name = "gcc_bimc_gpu_clk", 1253 + .ops = &clk_branch2_ops, 1254 + }, 1255 + }, 1256 + }; 1257 + 1258 + static struct clk_branch gcc_bimc_cdsp_clk = { 1259 + .halt_reg = 0x31030, 1260 + .halt_check = BRANCH_HALT, 1261 + .clkr = { 1262 + .enable_reg = 0x31030, 1263 + .enable_mask = BIT(0), 1264 + .hw.init = &(struct clk_init_data) { 1265 + .name = "gcc_bimc_cdsp_clk", 1266 + .parent_names = (const char *[]) { 1267 + "cdsp_bimc_clk_src", 1268 + }, 1269 + .num_parents = 1, 1270 + .flags = CLK_SET_RATE_PARENT, 1289 1271 .ops = &clk_branch2_ops, 1290 1272 }, 1291 1273 }, ··· 1846 1792 }, 1847 1793 }; 1848 1794 1795 + static struct clk_branch gcc_cdsp_tbu_clk = { 1796 + .halt_reg = 0x1203c, 1797 + .halt_check = BRANCH_VOTED, 1798 + .clkr = { 1799 + .enable_reg = 0x13020, 1800 + .enable_mask = BIT(9), 1801 + .hw.init = &(struct clk_init_data) { 1802 + .name = "gcc_cdsp_tbu_clk", 1803 + .parent_names = (const char *[]) { 1804 + "cdsp_bimc_clk_src", 1805 + }, 1806 + .num_parents = 1, 1807 + .flags = CLK_SET_RATE_PARENT, 1808 + .ops = &clk_branch2_ops, 1809 + }, 1810 + }, 1811 + }; 1812 + 1849 1813 static struct clk_branch gcc_gp1_clk = { 1850 1814 .halt_reg = 0x8000, 1851 1815 .halt_check = BRANCH_HALT, ··· 2376 2304 }, 2377 2305 }; 2378 2306 2307 + static struct clk_branch gcc_cdsp_cfg_ahb_clk = { 2308 + .halt_reg = 0x5e004, 2309 + .halt_check = BRANCH_HALT, 2310 + .clkr = { 2311 + .enable_reg = 0x5e004, 2312 + .enable_mask = BIT(0), 2313 + .hw.init = &(struct clk_init_data) { 2314 + .name = "gcc_cdsp_cfg_ahb_cbcr", 2315 + .ops = &clk_branch2_ops, 2316 + }, 2317 + }, 2318 + }; 2319 + 2379 2320 static struct clk_branch gcc_sdcc2_ahb_clk = { 2380 2321 .halt_reg = 0x4301c, 2381 2322 .halt_check = BRANCH_HALT, ··· 2633 2548 [GCC_ESC0_CLK_SRC] = &esc0_clk_src.clkr, 2634 2549 [GCC_APSS_AHB_CLK] = &gcc_apss_ahb_clk.clkr, 2635 2550 [GCC_BIMC_GFX_CLK] = &gcc_bimc_gfx_clk.clkr, 2551 + [GCC_BIMC_CDSP_CLK] = &gcc_bimc_cdsp_clk.clkr, 2636 2552 [GCC_BIMC_MDSS_CLK] = &gcc_bimc_mdss_clk.clkr, 2637 2553 [GCC_BLSP1_AHB_CLK] = &gcc_blsp1_ahb_clk.clkr, 2638 2554 [GCC_BLSP1_QUP0_I2C_APPS_CLK] = &gcc_blsp1_qup0_i2c_apps_clk.clkr, ··· 2691 2605 [GCC_SDCC1_AHB_CLK] = &gcc_sdcc1_ahb_clk.clkr, 2692 2606 [GCC_SDCC1_APPS_CLK] = &gcc_sdcc1_apps_clk.clkr, 2693 2607 [GCC_SDCC1_ICE_CORE_CLK] = &gcc_sdcc1_ice_core_clk.clkr, 2608 + [GCC_CDSP_CFG_AHB_CLK] = &gcc_cdsp_cfg_ahb_clk.clkr, 2694 2609 [GCC_SDCC2_AHB_CLK] = &gcc_sdcc2_ahb_clk.clkr, 2695 2610 [GCC_SDCC2_APPS_CLK] = &gcc_sdcc2_apps_clk.clkr, 2696 2611 [GCC_SYS_NOC_USB3_CLK] = &gcc_sys_noc_usb3_clk.clkr, ··· 2732 2645 [GCC_USB3_PHY_AUX_CLK_SRC] = &usb3_phy_aux_clk_src.clkr, 2733 2646 [GCC_USB_HS_SYSTEM_CLK_SRC] = &usb_hs_system_clk_src.clkr, 2734 2647 [GCC_VSYNC_CLK_SRC] = &vsync_clk_src.clkr, 2648 + [GCC_CDSP_BIMC_CLK_SRC] = &cdsp_bimc_clk_src.clkr, 2735 2649 [GCC_USB_HS_INACTIVITY_TIMERS_CLK] = 2736 2650 &gcc_usb_hs_inactivity_timers_clk.clkr, 2737 2651 [GCC_BIMC_GPU_CLK] = &gcc_bimc_gpu_clk.clkr, ··· 2741 2653 [GCC_GFX_TBU_CLK] = &gcc_gfx_tbu_clk.clkr, 2742 2654 [GCC_SMMU_CFG_CLK] = &gcc_smmu_cfg_clk.clkr, 2743 2655 [GCC_APSS_TCU_CLK] = &gcc_apss_tcu_clk.clkr, 2656 + [GCC_CDSP_TBU_CLK] = &gcc_cdsp_tbu_clk.clkr, 2744 2657 [GCC_CRYPTO_AHB_CLK] = &gcc_crypto_ahb_clk.clkr, 2745 2658 [GCC_CRYPTO_AXI_CLK] = &gcc_crypto_axi_clk.clkr, 2746 2659 [GCC_CRYPTO_CLK] = &gcc_crypto_clk.clkr, ··· 2753 2664 2754 2665 static const struct qcom_reset_map gcc_qcs404_resets[] = { 2755 2666 [GCC_GENI_IR_BCR] = { 0x0F000 }, 2667 + [GCC_CDSP_RESTART] = { 0x18000 }, 2756 2668 [GCC_USB_HS_BCR] = { 0x41000 }, 2757 2669 [GCC_USB2_HS_PHY_ONLY_BCR] = { 0x41034 }, 2758 2670 [GCC_QUSB2_PHY_BCR] = { 0x4103c },
+5
include/dt-bindings/clock/qcom,gcc-qcs404.h
··· 146 146 #define GCC_MDP_TBU_CLK 138 147 147 #define GCC_QDSS_DAP_CLK 139 148 148 #define GCC_DCC_XO_CLK 140 149 + #define GCC_CDSP_CFG_AHB_CLK 143 150 + #define GCC_BIMC_CDSP_CLK 144 151 + #define GCC_CDSP_TBU_CLK 145 152 + #define GCC_CDSP_BIMC_CLK_SRC 146 149 153 150 154 #define GCC_GENI_IR_BCR 0 151 155 #define GCC_USB_HS_BCR 1 ··· 165 161 #define GCC_PCIE_0_LINK_DOWN_BCR 11 166 162 #define GCC_PCIEPHY_0_PHY_BCR 12 167 163 #define GCC_EMAC_BCR 13 164 + #define GCC_CDSP_RESTART 14 168 165 169 166 #endif