openbmc.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Jeffery <andrew@aj.id.au>
To: joel@jms.id.au
Cc: openbmc@lists.ozlabs.org
Subject: [PATCH linux dev-5.10 v2 4/7] ARM: dts: p10bmc: Drop the openbmc, mctp-lpc node
Date: Wed, 23 Jun 2021 13:08:51 +0930	[thread overview]
Message-ID: <20210623033854.587464-5-andrew@aj.id.au> (raw)
In-Reply-To: <20210623033854.587464-1-andrew@aj.id.au>

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.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
 arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 11 ++++++-----
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 11 ++++++-----
 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 @@ &lpc_ctrl {
 	memory-region = <&flash_memory>;
 };
 
-&kcs4 {
-	compatible = "openbmc,mctp-lpc";
-	status = "okay";
-};
-
 &mac2 {
 	status = "okay";
 	pinctrl-names = "default";
@@ -4092,3 +4087,9 @@ &xdma {
 	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 73e94be5424b..9ea3864651d6 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1717,11 +1717,6 @@ &lpc_ctrl {
 	memory-region = <&flash_memory>;
 };
 
-&kcs4 {
-	compatible = "openbmc,mctp-lpc";
-	status = "okay";
-};
-
 &mac2 {
 	status = "okay";
 	pinctrl-names = "default";
@@ -1784,3 +1779,9 @@ &xdma {
 	status = "okay";
 	memory-region = <&vga_memory>;
 };
+
+&kcs4 {
+	status = "okay";
+	aspeed,lpc-io-reg = <0xca2>;
+	aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+};
-- 
2.30.2


  parent reply	other threads:[~2021-06-23  3:41 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23  3:38 [PATCH linux dev-5.10 v2 0/7] Rework use of KCS devices for P10 platforms Andrew Jeffery
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 1/7] ipmi: kcs_bmc_aspeed: Fix less than zero comparison of a unsigned int Andrew Jeffery
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 2/7] ipmi: kcs_bmc: Add a "raw" character device interface Andrew Jeffery
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 3/7] ARM: configs: Enable IPMI KCS raw chardev Andrew Jeffery
2021-06-23  3:38 ` Andrew Jeffery [this message]
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 5/7] misc: Remove obsolete mctp-lpc chardev Andrew Jeffery
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 6/7] ARM: dts: p10bmc: Switch to KCS 3 for MCTP binding Andrew Jeffery
2021-06-23  3:38 ` [PATCH linux dev-5.10 v2 7/7] ARM: dts: p10bmc: Enable KCS channel 2 Andrew Jeffery

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210623033854.587464-5-andrew@aj.id.au \
    --to=andrew@aj.id.au \
    --cc=joel@jms.id.au \
    --cc=openbmc@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).