ARM: dts: aspeed: p10bmc: Use KCS 3 for MCTP binding

The MCTP LPC driver was loaded by hacking up the compatible in the
devicetree node for KCS 4. With the introduction of the raw KCS driver
this hack is no-longer required. Use the regular compatible string for
KCS 4 and configure the appropriate SerIRQ.

The reset state of the status bits on KCS 4 is inappropriate for the
MCTP LPC binding. Switch to KCS 3 which has a different reset behaviour.

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

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index ec2abe02e25e003cab863ecaab89500ed4cbb696..53f8aa5dc1f3e755d1e7c7cda39b42fcdbf5bf05 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -3607,11 +3607,6 @@
        memory-region = <&flash_memory>;
 };
 
-&kcs4 {
-       compatible = "openbmc,mctp-lpc";
-       status = "okay";
-};
-
 &mac2 {
        status = "okay";
        pinctrl-names = "default";
@@ -3650,3 +3645,9 @@
        status = "okay";
        memory-region = <&vga_memory>;
 };
+
+&kcs3 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xca2>;
+       aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+};

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 1c632cb0fd16a3d4efd37fd0af56a8554347764c..915d33915676680282b0ac053406e6e10fcf4504 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -2379,3 +2379,9 @@
        status = "okay";
        memory-region = <&vga_memory>;
 };
+
+&kcs3 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xca2>;
+       aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+};