Commit fa4c8ec6 authored by Andrew Jeffery's avatar Andrew Jeffery Committed by Joel Stanley
Browse files

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: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent f90fe8d3

arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts

+2 −2
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ &uart5 { 
&kcs2 {

	// BMC KCS channel 2

	status = "okay";

	kcs_addr = <0xca8>;

	aspeed,lpc-io-reg = <0xca8>;

};



&kcs3 {

	// BMC KCS channel 3

	status = "okay";

	kcs_addr = <0xca2>;

	aspeed,lpc-io-reg = <0xca2>;

};



&gpio {

arch/arm/boot/dts/aspeed-g5.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -445,22 +445,22 @@ lpc_bmc: lpc-bmc@0 { 
					#size-cells = <1>;

					ranges = <0x0 0x0 0x80>;



					kcs1: kcs1@0 {

						compatible = "aspeed,ast2500-kcs-bmc";

					kcs1: kcs@24 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;

						interrupts = <8>;

						kcs_chan = <1>;

						status = "disabled";

					};

					kcs2: kcs2@0 {

						compatible = "aspeed,ast2500-kcs-bmc";

					kcs2: kcs@28 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;

						interrupts = <8>;

						kcs_chan = <2>;

						status = "disabled";

					};

					kcs3: kcs3@0 {

						compatible = "aspeed,ast2500-kcs-bmc";

					kcs3: kcs@2c {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;

						interrupts = <8>;

						kcs_chan = <3>;

						status = "disabled";

					};

				};
@@ -474,10 +474,10 @@ lpc_host: lpc-host@80 { 
					#size-cells = <1>;

					ranges = <0x0 0x80 0x1e0>;



					kcs4: kcs4@0 {

						compatible = "aspeed,ast2500-kcs-bmc";

					kcs4: kcs@94 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;

						interrupts = <8>;

						kcs_chan = <4>;

						status = "disabled";

					};

arch/arm/boot/dts/aspeed-g6.dtsi

+12 −11
Original line number Diff line number Diff line
@@ -474,22 +474,23 @@ lpc_bmc: lpc-bmc@0 { 
					#size-cells = <1>;

					ranges = <0x0 0x0 0x80>;



					kcs1: kcs1@0 {

						compatible = "aspeed,ast2600-kcs-bmc";

					kcs1: kcs@24 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;

						interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

						kcs_chan = <1>;

						status = "disabled";

					};

					kcs2: kcs2@0 {

						compatible = "aspeed,ast2600-kcs-bmc";

					kcs2: kcs@28 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;

						interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;

						kcs_chan = <2>;

						status = "disabled";

					};

					kcs3: kcs3@0 {

						compatible = "aspeed,ast2600-kcs-bmc";

					kcs3: kcs@2c {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;

						interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

						kcs_chan = <3>;

						status = "disabled";

					};

				};
@@ -503,10 +504,10 @@ lpc_host: lpc-host@80 { 
					#size-cells = <1>;

					ranges = <0x0 0x80 0x1e0>;



					kcs4: kcs4@0 {

						compatible = "aspeed,ast2600-kcs-bmc";

					kcs4: kcs@94 {

						compatible = "aspeed,ast2500-kcs-bmc-v2";

						reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;

						interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

						kcs_chan = <4>;

						status = "disabled";

					};