summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2021-06-23 06:38:51 +0300
committerJoel Stanley <joel@jms.id.au>2021-06-24 12:23:24 +0300
commitb9b15ac7a8a5685c195453608652b360d80c1367 (patch)
tree481f338f2f610bc3c8c48b5c6475c9f8bb908a89
parent2af21ee0752d846af3d712dd6927c01038340d85 (diff)
downloadlinux-b9b15ac7a8a5685c195453608652b360d80c1367.tar.xz
ARM: dts: p10bmc: Drop the openbmc, mctp-lpc node
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. OpenBMC-Staging-Count: 1 Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Link: https://lore.kernel.org/r/20210623033854.587464-5-andrew@aj.id.au Signed-off-by: Joel Stanley <joel@jms.id.au>
-rw-r--r--arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts11
-rw-r--r--arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts11
2 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 1c9e4ff5388b..d899c9620286 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -4049,11 +4049,6 @@
memory-region = <&flash_memory>;
};
-&kcs4 {
- compatible = "openbmc,mctp-lpc";
- status = "okay";
-};
-
&mac2 {
status = "okay";
pinctrl-names = "default";
@@ -4092,3 +4087,9 @@
status = "okay";
memory-region = <&vga_memory>;
};
+
+&kcs4 {
+ 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 19118823ae90..9ac07200b03a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1687,11 +1687,6 @@
memory-region = <&flash_memory>;
};
-&kcs4 {
- compatible = "openbmc,mctp-lpc";
- status = "okay";
-};
-
&mac2 {
status = "okay";
pinctrl-names = "default";
@@ -1754,3 +1749,9 @@
status = "okay";
memory-region = <&vga_memory>;
};
+
+&kcs4 {
+ status = "okay";
+ aspeed,lpc-io-reg = <0xca2>;
+ aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+};