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

clk: qcom: mmcc-msm8998: Remove unnecessary fallbacks to global clocks

A previous patch removes the "xo" clock from the global namespace making
it impossible to acquire by that ".name". The device-tree for msm8998
currently does not include an mmcc node but the dt-bindings for this
compatible already require all these clocks, and the patch introducing
this node [1] also includes them.

[1]: https://patchwork.kernel.org/project/linux-arm-msm/patch/20210901183123.1087392-1-angelogioacchino.delregno@somainline.org/

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Link: https://lore.kernel.org/r/20210911121340.261920-9-marijn.suijten@somainline.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Marijn Suijten and committed by
Stephen Boyd
6d26bb22 7837187c

+48 -57
+48 -57
drivers/clk/qcom/mmcc-msm8998.c
··· 53 53 .hw.init = &(struct clk_init_data){ 54 54 .name = "mmss_gpll0_div", 55 55 .parent_data = &(const struct clk_parent_data){ 56 - .fw_name = "gpll0", 57 - .name = "gpll0" 56 + .fw_name = "gpll0" 58 57 }, 59 58 .num_parents = 1, 60 59 .ops = &clk_fixed_factor_ops, ··· 77 78 .hw.init = &(struct clk_init_data){ 78 79 .name = "mmpll0", 79 80 .parent_data = &(const struct clk_parent_data){ 80 - .fw_name = "xo", 81 - .name = "xo" 81 + .fw_name = "xo" 82 82 }, 83 83 .num_parents = 1, 84 84 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 109 111 .hw.init = &(struct clk_init_data){ 110 112 .name = "mmpll1", 111 113 .parent_data = &(const struct clk_parent_data){ 112 - .fw_name = "xo", 113 - .name = "xo" 114 + .fw_name = "xo" 114 115 }, 115 116 .num_parents = 1, 116 117 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 138 141 .clkr.hw.init = &(struct clk_init_data){ 139 142 .name = "mmpll3", 140 143 .parent_data = &(const struct clk_parent_data){ 141 - .fw_name = "xo", 142 - .name = "xo" 144 + .fw_name = "xo" 143 145 }, 144 146 .num_parents = 1, 145 147 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 166 170 .clkr.hw.init = &(struct clk_init_data){ 167 171 .name = "mmpll4", 168 172 .parent_data = &(const struct clk_parent_data){ 169 - .fw_name = "xo", 170 - .name = "xo" 173 + .fw_name = "xo" 171 174 }, 172 175 .num_parents = 1, 173 176 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 194 199 .clkr.hw.init = &(struct clk_init_data){ 195 200 .name = "mmpll5", 196 201 .parent_data = &(const struct clk_parent_data){ 197 - .fw_name = "xo", 198 - .name = "xo" 202 + .fw_name = "xo" 199 203 }, 200 204 .num_parents = 1, 201 205 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 222 228 .clkr.hw.init = &(struct clk_init_data){ 223 229 .name = "mmpll6", 224 230 .parent_data = &(const struct clk_parent_data){ 225 - .fw_name = "xo", 226 - .name = "xo" 231 + .fw_name = "xo" 227 232 }, 228 233 .num_parents = 1, 229 234 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 250 257 .clkr.hw.init = &(struct clk_init_data){ 251 258 .name = "mmpll7", 252 259 .parent_data = &(const struct clk_parent_data){ 253 - .fw_name = "xo", 254 - .name = "xo" 260 + .fw_name = "xo" 255 261 }, 256 262 .num_parents = 1, 257 263 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 278 286 .clkr.hw.init = &(struct clk_init_data){ 279 287 .name = "mmpll10", 280 288 .parent_data = &(const struct clk_parent_data){ 281 - .fw_name = "xo", 282 - .name = "xo" 289 + .fw_name = "xo" 283 290 }, 284 291 .num_parents = 1, 285 292 .ops = &clk_alpha_pll_fixed_fabia_ops, ··· 307 316 }; 308 317 309 318 static const struct clk_parent_data mmss_xo_hdmi[] = { 310 - { .fw_name = "xo", .name = "xo" }, 311 - { .fw_name = "hdmipll", .name = "hdmipll" }, 312 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 319 + { .fw_name = "xo" }, 320 + { .fw_name = "hdmipll" }, 321 + { .fw_name = "core_bi_pll_test_se" }, 313 322 }; 314 323 315 324 static const struct parent_map mmss_xo_dsi0pll_dsi1pll_map[] = { ··· 320 329 }; 321 330 322 331 static const struct clk_parent_data mmss_xo_dsi0pll_dsi1pll[] = { 323 - { .fw_name = "xo", .name = "xo" }, 324 - { .fw_name = "dsi0dsi", .name = "dsi0dsi" }, 325 - { .fw_name = "dsi1dsi", .name = "dsi1dsi" }, 326 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 332 + { .fw_name = "xo" }, 333 + { .fw_name = "dsi0dsi" }, 334 + { .fw_name = "dsi1dsi" }, 335 + { .fw_name = "core_bi_pll_test_se" }, 327 336 }; 328 337 329 338 static const struct parent_map mmss_xo_dsibyte_map[] = { ··· 334 343 }; 335 344 336 345 static const struct clk_parent_data mmss_xo_dsibyte[] = { 337 - { .fw_name = "xo", .name = "xo" }, 338 - { .fw_name = "dsi0byte", .name = "dsi0byte" }, 339 - { .fw_name = "dsi1byte", .name = "dsi1byte" }, 340 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 346 + { .fw_name = "xo" }, 347 + { .fw_name = "dsi0byte" }, 348 + { .fw_name = "dsi1byte" }, 349 + { .fw_name = "core_bi_pll_test_se" }, 341 350 }; 342 351 343 352 static const struct parent_map mmss_xo_dp_map[] = { ··· 348 357 }; 349 358 350 359 static const struct clk_parent_data mmss_xo_dp[] = { 351 - { .fw_name = "xo", .name = "xo" }, 352 - { .fw_name = "dplink", .name = "dplink" }, 353 - { .fw_name = "dpvco", .name = "dpvco" }, 354 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 360 + { .fw_name = "xo" }, 361 + { .fw_name = "dplink" }, 362 + { .fw_name = "dpvco" }, 363 + { .fw_name = "core_bi_pll_test_se" }, 355 364 }; 356 365 357 366 static const struct parent_map mmss_xo_gpll0_gpll0_div_map[] = { ··· 362 371 }; 363 372 364 373 static const struct clk_parent_data mmss_xo_gpll0_gpll0_div[] = { 365 - { .fw_name = "xo", .name = "xo" }, 366 - { .fw_name = "gpll0", .name = "gpll0" }, 374 + { .fw_name = "xo" }, 375 + { .fw_name = "gpll0" }, 367 376 { .hw = &gpll0_div.hw }, 368 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 377 + { .fw_name = "core_bi_pll_test_se" }, 369 378 }; 370 379 371 380 static const struct parent_map mmss_xo_mmpll0_gpll0_gpll0_div_map[] = { ··· 377 386 }; 378 387 379 388 static const struct clk_parent_data mmss_xo_mmpll0_gpll0_gpll0_div[] = { 380 - { .fw_name = "xo", .name = "xo" }, 389 + { .fw_name = "xo" }, 381 390 { .hw = &mmpll0_out_even.clkr.hw }, 382 - { .fw_name = "gpll0", .name = "gpll0" }, 391 + { .fw_name = "gpll0" }, 383 392 { .hw = &gpll0_div.hw }, 384 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 393 + { .fw_name = "core_bi_pll_test_se" }, 385 394 }; 386 395 387 396 static const struct parent_map mmss_xo_mmpll0_mmpll1_gpll0_gpll0_div_map[] = { ··· 394 403 }; 395 404 396 405 static const struct clk_parent_data mmss_xo_mmpll0_mmpll1_gpll0_gpll0_div[] = { 397 - { .fw_name = "xo", .name = "xo" }, 406 + { .fw_name = "xo" }, 398 407 { .hw = &mmpll0_out_even.clkr.hw }, 399 408 { .hw = &mmpll1_out_even.clkr.hw }, 400 - { .fw_name = "gpll0", .name = "gpll0" }, 409 + { .fw_name = "gpll0" }, 401 410 { .hw = &gpll0_div.hw }, 402 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 411 + { .fw_name = "core_bi_pll_test_se" }, 403 412 }; 404 413 405 414 static const struct parent_map mmss_xo_mmpll0_mmpll5_gpll0_gpll0_div_map[] = { ··· 412 421 }; 413 422 414 423 static const struct clk_parent_data mmss_xo_mmpll0_mmpll5_gpll0_gpll0_div[] = { 415 - { .fw_name = "xo", .name = "xo" }, 424 + { .fw_name = "xo" }, 416 425 { .hw = &mmpll0_out_even.clkr.hw }, 417 426 { .hw = &mmpll5_out_even.clkr.hw }, 418 - { .fw_name = "gpll0", .name = "gpll0" }, 427 + { .fw_name = "gpll0" }, 419 428 { .hw = &gpll0_div.hw }, 420 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 429 + { .fw_name = "core_bi_pll_test_se" }, 421 430 }; 422 431 423 432 static const struct parent_map mmss_xo_mmpll0_mmpll3_mmpll6_gpll0_gpll0_div_map[] = { ··· 431 440 }; 432 441 433 442 static const struct clk_parent_data mmss_xo_mmpll0_mmpll3_mmpll6_gpll0_gpll0_div[] = { 434 - { .fw_name = "xo", .name = "xo" }, 443 + { .fw_name = "xo" }, 435 444 { .hw = &mmpll0_out_even.clkr.hw }, 436 445 { .hw = &mmpll3_out_even.clkr.hw }, 437 446 { .hw = &mmpll6_out_even.clkr.hw }, 438 - { .fw_name = "gpll0", .name = "gpll0" }, 447 + { .fw_name = "gpll0" }, 439 448 { .hw = &gpll0_div.hw }, 440 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 449 + { .fw_name = "core_bi_pll_test_se" }, 441 450 }; 442 451 443 452 static const struct parent_map mmss_xo_mmpll4_mmpll7_mmpll10_gpll0_gpll0_div_map[] = { ··· 451 460 }; 452 461 453 462 static const struct clk_parent_data mmss_xo_mmpll4_mmpll7_mmpll10_gpll0_gpll0_div[] = { 454 - { .fw_name = "xo", .name = "xo" }, 463 + { .fw_name = "xo" }, 455 464 { .hw = &mmpll4_out_even.clkr.hw }, 456 465 { .hw = &mmpll7_out_even.clkr.hw }, 457 466 { .hw = &mmpll10_out_even.clkr.hw }, 458 - { .fw_name = "gpll0", .name = "gpll0" }, 467 + { .fw_name = "gpll0" }, 459 468 { .hw = &gpll0_div.hw }, 460 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 469 + { .fw_name = "core_bi_pll_test_se" }, 461 470 }; 462 471 463 472 static const struct parent_map mmss_xo_mmpll0_mmpll7_mmpll10_gpll0_gpll0_div_map[] = { ··· 471 480 }; 472 481 473 482 static const struct clk_parent_data mmss_xo_mmpll0_mmpll7_mmpll10_gpll0_gpll0_div[] = { 474 - { .fw_name = "xo", .name = "xo" }, 483 + { .fw_name = "xo" }, 475 484 { .hw = &mmpll0_out_even.clkr.hw }, 476 485 { .hw = &mmpll7_out_even.clkr.hw }, 477 486 { .hw = &mmpll10_out_even.clkr.hw }, 478 - { .fw_name = "gpll0", .name = "gpll0" }, 487 + { .fw_name = "gpll0" }, 479 488 { .hw = &gpll0_div.hw }, 480 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 489 + { .fw_name = "core_bi_pll_test_se" }, 481 490 }; 482 491 483 492 static const struct parent_map mmss_xo_mmpll0_mmpll4_mmpll7_mmpll10_gpll0_gpll0_div_map[] = { ··· 492 501 }; 493 502 494 503 static const struct clk_parent_data mmss_xo_mmpll0_mmpll4_mmpll7_mmpll10_gpll0_gpll0_div[] = { 495 - { .fw_name = "xo", .name = "xo" }, 504 + { .fw_name = "xo" }, 496 505 { .hw = &mmpll0_out_even.clkr.hw }, 497 506 { .hw = &mmpll4_out_even.clkr.hw }, 498 507 { .hw = &mmpll7_out_even.clkr.hw }, 499 508 { .hw = &mmpll10_out_even.clkr.hw }, 500 - { .fw_name = "gpll0", .name = "gpll0" }, 509 + { .fw_name = "gpll0" }, 501 510 { .hw = &gpll0_div.hw }, 502 - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" }, 511 + { .fw_name = "core_bi_pll_test_se" }, 503 512 }; 504 513 505 514 static struct clk_rcg2 byte0_clk_src = {