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

ARM: dts: aspeed: Change KCS nodes to v2 binding

Fixes the following warnings for both g5 and g6 SoCs:

arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning
(unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: node
has a unit name, but no reg property

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>

authored by

Andrew Jeffery and committed by
Joel Stanley fa4c8ec6 f90fe8d3

+26 -25
+2 -2
arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
··· 113 113 &kcs2 { 114 114 // BMC KCS channel 2 115 115 status = "okay"; 116 - kcs_addr = <0xca8>; 116 + aspeed,lpc-io-reg = <0xca8>; 117 117 }; 118 118 119 119 &kcs3 { 120 120 // BMC KCS channel 3 121 121 status = "okay"; 122 - kcs_addr = <0xca2>; 122 + aspeed,lpc-io-reg = <0xca2>; 123 123 }; 124 124 125 125 &gpio {
+12 -12
arch/arm/boot/dts/aspeed-g5.dtsi
··· 445 445 #size-cells = <1>; 446 446 ranges = <0x0 0x0 0x80>; 447 447 448 - kcs1: kcs1@0 { 449 - compatible = "aspeed,ast2500-kcs-bmc"; 448 + kcs1: kcs@24 { 449 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 450 + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; 450 451 interrupts = <8>; 451 - kcs_chan = <1>; 452 452 status = "disabled"; 453 453 }; 454 - kcs2: kcs2@0 { 455 - compatible = "aspeed,ast2500-kcs-bmc"; 454 + kcs2: kcs@28 { 455 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 456 + reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>; 456 457 interrupts = <8>; 457 - kcs_chan = <2>; 458 458 status = "disabled"; 459 459 }; 460 - kcs3: kcs3@0 { 461 - compatible = "aspeed,ast2500-kcs-bmc"; 460 + kcs3: kcs@2c { 461 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 462 + reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>; 462 463 interrupts = <8>; 463 - kcs_chan = <3>; 464 464 status = "disabled"; 465 465 }; 466 466 }; ··· 474 474 #size-cells = <1>; 475 475 ranges = <0x0 0x80 0x1e0>; 476 476 477 - kcs4: kcs4@0 { 478 - compatible = "aspeed,ast2500-kcs-bmc"; 477 + kcs4: kcs@94 { 478 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 479 + reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>; 479 480 interrupts = <8>; 480 - kcs_chan = <4>; 481 481 status = "disabled"; 482 482 }; 483 483
+12 -11
arch/arm/boot/dts/aspeed-g6.dtsi
··· 474 474 #size-cells = <1>; 475 475 ranges = <0x0 0x0 0x80>; 476 476 477 - kcs1: kcs1@0 { 478 - compatible = "aspeed,ast2600-kcs-bmc"; 477 + kcs1: kcs@24 { 478 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 479 + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; 479 480 interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; 480 481 kcs_chan = <1>; 481 482 status = "disabled"; 482 483 }; 483 - kcs2: kcs2@0 { 484 - compatible = "aspeed,ast2600-kcs-bmc"; 484 + kcs2: kcs@28 { 485 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 486 + reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>; 485 487 interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; 486 - kcs_chan = <2>; 487 488 status = "disabled"; 488 489 }; 489 - kcs3: kcs3@0 { 490 - compatible = "aspeed,ast2600-kcs-bmc"; 490 + kcs3: kcs@2c { 491 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 492 + reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>; 491 493 interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; 492 - kcs_chan = <3>; 493 494 status = "disabled"; 494 495 }; 495 496 }; ··· 504 503 #size-cells = <1>; 505 504 ranges = <0x0 0x80 0x1e0>; 506 505 507 - kcs4: kcs4@0 { 508 - compatible = "aspeed,ast2600-kcs-bmc"; 506 + kcs4: kcs@94 { 507 + compatible = "aspeed,ast2500-kcs-bmc-v2"; 508 + reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>; 509 509 interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; 510 - kcs_chan = <4>; 511 510 status = "disabled"; 512 511 }; 513 512