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

clk: ingenic: Minor cosmetic fixups for X1000

Remove redundant -1 entries from the parents array and fix
a couple indentation / whitespace issues.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20221026194345.243007-7-aidanmacdonald.0x0@gmail.com
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Aidan MacDonald and committed by
Stephen Boyd
8fe873d4 662e8ed7

+24 -25
+24 -25
drivers/clk/ingenic/x1000-cgu.c
··· 216 216 217 217 [X1000_CLK_APLL] = { 218 218 "apll", CGU_CLK_PLL, 219 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 219 + .parents = { X1000_CLK_EXCLK }, 220 220 .pll = { 221 221 .reg = CGU_REG_APLL, 222 222 .rate_multiplier = 1, ··· 239 239 240 240 [X1000_CLK_MPLL] = { 241 241 "mpll", CGU_CLK_PLL, 242 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 242 + .parents = { X1000_CLK_EXCLK }, 243 243 .pll = { 244 244 .reg = CGU_REG_MPLL, 245 245 .rate_multiplier = 1, ··· 289 289 * system; mark it critical. 290 290 */ 291 291 .flags = CLK_IS_CRITICAL, 292 - .parents = { X1000_CLK_CPUMUX, -1, -1, -1 }, 292 + .parents = { X1000_CLK_CPUMUX }, 293 293 .div = { CGU_REG_CPCCR, 0, 1, 4, 22, -1, -1 }, 294 294 .gate = { CGU_REG_CLKGR, 30 }, 295 295 }, ··· 301 301 * disabling it or any parent clocks will hang the system. 302 302 */ 303 303 .flags = CLK_IS_CRITICAL, 304 - .parents = { X1000_CLK_CPUMUX, -1, -1, -1 }, 304 + .parents = { X1000_CLK_CPUMUX }, 305 305 .div = { CGU_REG_CPCCR, 4, 1, 4, 22, -1, -1 }, 306 306 }, 307 307 ··· 320 320 321 321 [X1000_CLK_AHB2] = { 322 322 "ahb2", CGU_CLK_DIV, 323 - .parents = { X1000_CLK_AHB2PMUX, -1, -1, -1 }, 323 + .parents = { X1000_CLK_AHB2PMUX }, 324 324 .div = { CGU_REG_CPCCR, 12, 1, 4, 20, -1, -1 }, 325 325 }, 326 326 327 327 [X1000_CLK_PCLK] = { 328 328 "pclk", CGU_CLK_DIV | CGU_CLK_GATE, 329 - .parents = { X1000_CLK_AHB2PMUX, -1, -1, -1 }, 329 + .parents = { X1000_CLK_AHB2PMUX }, 330 330 .div = { CGU_REG_CPCCR, 16, 1, 4, 20, -1, -1 }, 331 331 .gate = { CGU_REG_CLKGR, 28 }, 332 332 }, ··· 393 393 394 394 [X1000_CLK_MSCMUX] = { 395 395 "msc_mux", CGU_CLK_MUX, 396 - .parents = { X1000_CLK_SCLKA, X1000_CLK_MPLL}, 396 + .parents = { X1000_CLK_SCLKA, X1000_CLK_MPLL }, 397 397 .mux = { CGU_REG_MSC0CDR, 31, 1 }, 398 398 }, 399 399 400 400 [X1000_CLK_MSC0] = { 401 401 "msc0", CGU_CLK_DIV | CGU_CLK_GATE, 402 - .parents = { X1000_CLK_MSCMUX, -1, -1, -1 }, 402 + .parents = { X1000_CLK_MSCMUX }, 403 403 .div = { CGU_REG_MSC0CDR, 0, 2, 8, 29, 28, 27 }, 404 404 .gate = { CGU_REG_CLKGR, 4 }, 405 405 }, ··· 413 413 414 414 [X1000_CLK_OTG] = { 415 415 "otg", CGU_CLK_DIV | CGU_CLK_GATE | CGU_CLK_MUX, 416 - .parents = { X1000_CLK_EXCLK, -1, 417 - X1000_CLK_APLL, X1000_CLK_MPLL }, 416 + .parents = { X1000_CLK_EXCLK, -1, X1000_CLK_APLL, X1000_CLK_MPLL }, 418 417 .mux = { CGU_REG_USBCDR, 30, 2 }, 419 418 .div = { CGU_REG_USBCDR, 0, 1, 8, 29, 28, 27 }, 420 419 .gate = { CGU_REG_CLKGR, 3 }, ··· 421 422 422 423 [X1000_CLK_SSIPLL] = { 423 424 "ssi_pll", CGU_CLK_MUX | CGU_CLK_DIV, 424 - .parents = { X1000_CLK_SCLKA, X1000_CLK_MPLL, -1, -1 }, 425 + .parents = { X1000_CLK_SCLKA, X1000_CLK_MPLL }, 425 426 .mux = { CGU_REG_SSICDR, 31, 1 }, 426 427 .div = { CGU_REG_SSICDR, 0, 1, 8, 29, 28, 27 }, 427 428 }, ··· 434 435 435 436 [X1000_CLK_SSIMUX] = { 436 437 "ssi_mux", CGU_CLK_MUX, 437 - .parents = { X1000_CLK_EXCLK, X1000_CLK_SSIPLL_DIV2, -1, -1 }, 438 + .parents = { X1000_CLK_EXCLK, X1000_CLK_SSIPLL_DIV2 }, 438 439 .mux = { CGU_REG_SSICDR, 30, 1 }, 439 440 }, 440 441 ··· 455 456 456 457 [X1000_CLK_EMC] = { 457 458 "emc", CGU_CLK_GATE, 458 - .parents = { X1000_CLK_AHB2, -1, -1, -1 }, 459 + .parents = { X1000_CLK_AHB2 }, 459 460 .gate = { CGU_REG_CLKGR, 0 }, 460 461 }, 461 462 462 463 [X1000_CLK_EFUSE] = { 463 464 "efuse", CGU_CLK_GATE, 464 - .parents = { X1000_CLK_AHB2, -1, -1, -1 }, 465 + .parents = { X1000_CLK_AHB2 }, 465 466 .gate = { CGU_REG_CLKGR, 1 }, 466 467 }, 467 468 468 469 [X1000_CLK_SFC] = { 469 470 "sfc", CGU_CLK_GATE, 470 - .parents = { X1000_CLK_SSIPLL, -1, -1, -1 }, 471 + .parents = { X1000_CLK_SSIPLL }, 471 472 .gate = { CGU_REG_CLKGR, 2 }, 472 473 }, 473 474 474 475 [X1000_CLK_I2C0] = { 475 476 "i2c0", CGU_CLK_GATE, 476 - .parents = { X1000_CLK_PCLK, -1, -1, -1 }, 477 + .parents = { X1000_CLK_PCLK }, 477 478 .gate = { CGU_REG_CLKGR, 7 }, 478 479 }, 479 480 480 481 [X1000_CLK_I2C1] = { 481 482 "i2c1", CGU_CLK_GATE, 482 - .parents = { X1000_CLK_PCLK, -1, -1, -1 }, 483 + .parents = { X1000_CLK_PCLK }, 483 484 .gate = { CGU_REG_CLKGR, 8 }, 484 485 }, 485 486 486 487 [X1000_CLK_I2C2] = { 487 488 "i2c2", CGU_CLK_GATE, 488 - .parents = { X1000_CLK_PCLK, -1, -1, -1 }, 489 + .parents = { X1000_CLK_PCLK }, 489 490 .gate = { CGU_REG_CLKGR, 9 }, 490 491 }, 491 492 ··· 497 498 498 499 [X1000_CLK_UART0] = { 499 500 "uart0", CGU_CLK_GATE, 500 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 501 + .parents = { X1000_CLK_EXCLK }, 501 502 .gate = { CGU_REG_CLKGR, 14 }, 502 503 }, 503 504 504 505 [X1000_CLK_UART1] = { 505 506 "uart1", CGU_CLK_GATE, 506 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 507 + .parents = { X1000_CLK_EXCLK}, 507 508 .gate = { CGU_REG_CLKGR, 15 }, 508 509 }, 509 510 510 511 [X1000_CLK_UART2] = { 511 512 "uart2", CGU_CLK_GATE, 512 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 513 + .parents = { X1000_CLK_EXCLK }, 513 514 .gate = { CGU_REG_CLKGR, 16 }, 514 515 }, 515 516 516 517 [X1000_CLK_TCU] = { 517 518 "tcu", CGU_CLK_GATE, 518 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 519 + .parents = { X1000_CLK_EXCLK }, 519 520 .gate = { CGU_REG_CLKGR, 18 }, 520 521 }, 521 522 522 523 [X1000_CLK_SSI] = { 523 524 "ssi", CGU_CLK_GATE, 524 - .parents = { X1000_CLK_SSIMUX, -1, -1, -1 }, 525 + .parents = { X1000_CLK_SSIMUX }, 525 526 .gate = { CGU_REG_CLKGR, 19 }, 526 527 }, 527 528 528 529 [X1000_CLK_OST] = { 529 530 "ost", CGU_CLK_GATE, 530 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 531 + .parents = { X1000_CLK_EXCLK }, 531 532 .gate = { CGU_REG_CLKGR, 20 }, 532 533 }, 533 534 534 535 [X1000_CLK_PDMA] = { 535 536 "pdma", CGU_CLK_GATE, 536 - .parents = { X1000_CLK_EXCLK, -1, -1, -1 }, 537 + .parents = { X1000_CLK_EXCLK }, 537 538 .gate = { CGU_REG_CLKGR, 21 }, 538 539 }, 539 540 };