openbmc.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Eddie James <eajames@linux.ibm.com>
To: openbmc@lists.ozlabs.org
Cc: eajames@linux.ibm.com
Subject: [PATCH linux dev-5.10 v2 4/4] ARM: dts: aspeed: Rainier: Remove gpio hog for GPIOP7
Date: Wed, 15 Sep 2021 16:47:38 -0500	[thread overview]
Message-ID: <20210915214738.34382-5-eajames@linux.ibm.com> (raw)
In-Reply-To: <20210915214738.34382-1-eajames@linux.ibm.com>

Only the pass 1 Ingraham board (Rainier system) had a micro-controller
wired to GPIOP7 on ball Y23. Pass 2 boards have this ball wired to the
heartbeat LED, so remove the hog and add it to the pass 1 devicetrees.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts | 9 +++++++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts    | 9 +++++++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts       | 7 -------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
index e35a3efd9d22..b7ec83848750 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u-p1.dts
@@ -22,6 +22,15 @@ aliases {
 	};
 };
 
+&gpio0 {
+	pin_mclr_vpp {
+		gpio-hog;
+		gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
+		output-high;
+		line-name = "mclr_vpp";
+	};
+};
+
 &i2c4 {
 	/delete-node/ pca9546@70;
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
index b3c923f1838b..d650dbebe5d2 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-p1.dts
@@ -22,6 +22,15 @@ aliases {
 	};
 };
 
+&gpio0 {
+	pin_mclr_vpp {
+		gpio-hog;
+		gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
+		output-high;
+		line-name = "mclr_vpp";
+	};
+};
+
 &i2c4 {
 	/delete-node/ pca9546@70;
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 2b6bb20dfd82..9250d9465407 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -254,13 +254,6 @@ &gpio0 {
 	/*Y0-Y7*/	"","","","","","","","",
 	/*Z0-Z7*/	"","","","","","","","";
 
-	pin_mclr_vpp {
-		gpio-hog;
-		gpios = <ASPEED_GPIO(P, 7) GPIO_OPEN_DRAIN>;
-		output-high;
-		line-name = "mclr_vpp";
-	};
-
 	i2c3_mux_oe_n {
 		gpio-hog;
 		gpios = <ASPEED_GPIO(G, 6) GPIO_ACTIVE_LOW>;
-- 
2.27.0


  parent reply	other threads:[~2021-09-15 21:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-15 21:47 [PATCH linux dev-5.10 v2 0/4] ARM: dts: aspeed: p10 i2c, leds, and gpios Eddie James
2021-09-15 21:47 ` [PATCH linux dev-5.10 v2 1/4] ARM: dts: aspeed: everest: Add I2C bus 15 muxes Eddie James
2021-09-15 21:47 ` [PATCH linux dev-5.10 v2 2/4] ARM: dts: aspeed: rainier: Add system LEDs Eddie James
2021-09-15 21:47 ` [PATCH linux dev-5.10 v2 3/4] ARM: dts: aspeed: rainier: Add eeprom on bus 12 Eddie James
2021-09-15 21:47 ` Eddie James [this message]
2021-09-16  7:20   ` [PATCH linux dev-5.10 v2 4/4] ARM: dts: aspeed: Rainier: Remove gpio hog for GPIOP7 Joel Stanley
2021-09-16  7:20 ` [PATCH linux dev-5.10 v2 0/4] ARM: dts: aspeed: p10 i2c, leds, and gpios Joel Stanley

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=20210915214738.34382-5-eajames@linux.ibm.com \
    --to=eajames@linux.ibm.com \
    --cc=openbmc@lists.ozlabs.org \
    --subject='Re: [PATCH linux dev-5.10 v2 4/4] ARM: dts: aspeed: Rainier: Remove gpio hog for GPIOP7' \
    /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

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).