devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eddie James <eajames@linux.ibm.com>
To: joel@jms.id.au
Cc: andrew@aj.id.au, robh+dt@kernel.org, devicetree@vger.kernel.org,
	linux-aspeed@lists.ozlabs.org,
	Alpana Kumari <alpankum@in.ibm.com>,
	Eddie James <eajames@linux.ibm.com>
Subject: [PATCH 09/22] ARM: dts: aspeed: rainier: Add presence GPIOs
Date: Mon, 29 Mar 2021 10:00:07 -0500	[thread overview]
Message-ID: <20210329150020.13632-10-eajames@linux.ibm.com> (raw)
In-Reply-To: <20210329150020.13632-1-eajames@linux.ibm.com>

From: Alpana Kumari <alpankum@in.ibm.com>

This commit adds presence detect GPIO chips for various FRUs on
Rainier. Also, correct the I2C address for the tca9554.

Signed-off-by: Alpana Kumari <alpankum@in.ibm.com>
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 169 ++++++++++++++++++-
 1 file changed, 160 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 78238ffc8997..1d66dc995797 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1538,20 +1538,64 @@ eeprom@51 {
 		reg = <0x51>;
 	};
 
-	tca9554@40 {
+	tca_pres1: tca9554@20{
 		compatible = "ti,tca9554";
-		reg = <0x40>;
+		reg = <0x20>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		gpio-controller;
 		#gpio-cells = <2>;
 
-		smbus0-hog {
-			gpio-hog;
-			gpios = <4 GPIO_ACTIVE_HIGH>;
-			output-high;
-			line-name = "smbus0";
+		gpio-line-names = "",
+			"RUSSEL_FW_I2C_ENABLE_N",
+			"RUSSEL_OPPANEL_PRESENCE_N",
+			"BLYTH_OPPANEL_PRESENCE_N",
+			"CPU_TPM_CARD_PRESENT_N",
+			"DASD_BP2_PRESENT_N",
+			"DASD_BP1_PRESENT_N",
+			"DASD_BP0_PRESENT_N";
+
+		gpio@0 {
+			reg = <0>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@1 {
+			reg = <1>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@2 {
+			reg = <2>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@3 {
+			reg = <3>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@4 {
+			reg = <4>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@5 {
+			reg = <5>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-	};
 
+		gpio@6 {
+			reg = <6>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@7 {
+			reg = <7>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+	};
 };
 
 &i2c1 {
@@ -1574,6 +1618,104 @@ power-supply@69 {
 		compatible = "ibm,cffps";
 		reg = <0x69>;
 	};
+
+	pca_pres1: pca9552@61 {
+		compatible = "nxp,pca9552";
+		reg = <0x61>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		gpio-line-names =
+			"SLOT0_PRSNT_EN_RSVD", "SLOT1_PRSNT_EN_RSVD",
+			"SLOT2_PRSNT_EN_RSVD", "SLOT3_PRSNT_EN_RSVD",
+			"SLOT4_PRSNT_EN_RSVD", "SLOT0_EXPANDER_PRSNT_N",
+			"SLOT1_EXPANDER_PRSNT_N", "SLOT2_EXPANDER_PRSNT_N",
+			"SLOT3_EXPANDER_PRSNT_N", "SLOT4_EXPANDER_PRSNT_N",
+			"", "", "", "", "", "";
+
+		gpio@0 {
+			reg = <0>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@1 {
+			reg = <1>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@2 {
+			reg = <2>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@3 {
+			reg = <3>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@4 {
+			reg = <4>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@5 {
+			reg = <5>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@6 {
+			reg = <6>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@7 {
+			reg = <7>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@8 {
+			reg = <8>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@9 {
+			reg = <9>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@10 {
+			reg = <10>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@11 {
+			reg = <11>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@12 {
+			reg = <12>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@13 {
+			reg = <13>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@14 {
+			reg = <14>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+
+		gpio@15 {
+			reg = <15>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+	};
 };
 
 &i2c4 {
@@ -2423,7 +2565,7 @@ eeprom@51 {
 		reg = <0x51>;
 	};
 
-	pca1: pca9552@61 {
+	pca_pres3: pca9552@61 {
 		compatible = "nxp,pca9552";
 		reg = <0x61>;
 		#address-cells = <1>;
@@ -2431,6 +2573,15 @@ pca1: pca9552@61 {
 		gpio-controller;
 		#gpio-cells = <2>;
 
+		gpio-line-names =
+			"SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD",
+			"SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD",
+			"SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD",
+			"SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N",
+			"SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N",
+			"SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N",
+			"", "", "", "";
+
 		gpio@0 {
 			reg = <0>;
 			type = <PCA955X_TYPE_GPIO>;
-- 
2.27.0


  parent reply	other threads:[~2021-03-29 15:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-29 14:59 [PATCH 00/22] ARM: dts: aspeed: Updates for Rainier and Everest machines Eddie James
2021-03-29 14:59 ` [PATCH 01/22] ARM: dts: aspeed: rainier: Add Operator Panel LEDs Eddie James
2021-03-29 15:00 ` [PATCH 02/22] ARM: dts: aspeed: rainier: Add directly controlled LEDs Eddie James
2021-03-29 15:00 ` [PATCH 03/22] ARM: dts: aspeed: rainier: Add gpio-keys-polled for fans Eddie James
2021-03-29 15:00 ` [PATCH 04/22] ARM: dts: aspeed: rainier: Add additional processor CFAMs Eddie James
2021-03-29 15:00 ` [PATCH 05/22] ARM: dts: aspeed: rainier: Add leds that are off PCA9552 Eddie James
2021-03-29 15:00 ` [PATCH 06/22] ARM: dts: aspeed: rainier: Add leds that are off pic16f882 Eddie James
2021-03-29 15:00 ` [PATCH 07/22] ARM: dts: aspeed: rainier: Add leds on optional DASD cards Eddie James
2021-03-29 15:00 ` [PATCH 08/22] ARM: dts: aspeed: rainier: Add leds on optional PCI cable cards Eddie James
2021-03-29 15:00 ` Eddie James [this message]
2021-03-29 15:00 ` [PATCH 10/22] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
2021-03-29 15:00 ` [PATCH 11/22] ARM: dts: aspeed: rainier 4U: Fix fan configuration Eddie James
2021-03-30  0:23   ` kernel test robot
2021-03-29 15:00 ` [PATCH 12/22] ARM: dts: aspeed: Everest: Add I2C components Eddie James
2021-03-29 15:00 ` [PATCH 13/22] ARM: dts: Aspeed: Everest: Add max31785 fan controller device Eddie James
2021-03-29 15:00 ` [PATCH 14/22] ARM: dts: Aspeed: Everest: Add FSI CFAMs and re-number engines Eddie James
2021-03-29 15:00 ` [PATCH 15/22] ARM: dts: Aspeed: Everest: Add pca9552 fan presence Eddie James
2021-04-07 22:34   ` Brandon Wyman
2021-03-29 15:00 ` [PATCH 16/22] ARM: dts: aspeed: everest: Add power supply i2c devices Eddie James
2021-03-29 15:00 ` [PATCH 17/22] ARM: dts: aspeed: everest: Add UCD90320 power sequencer Eddie James
2021-03-29 15:00 ` [PATCH 18/22] ARM: dts: aspeed: everest: GPIOs support Eddie James
2021-04-07 22:19   ` Brandon Wyman
2021-03-29 15:00 ` [PATCH 19/22] ARM: dts: Aspeed: Everest: Add RTC Eddie James
2021-03-29 15:00 ` [PATCH 20/22] ARM: dts: aspeed: everest: Enable fan watchdog Eddie James
2021-04-08  0:34   ` Andrew Jeffery
2021-03-29 15:00 ` [PATCH 21/22] ARM: dts: aspeed: rainier: Support pass 2 planar Eddie James
2021-03-30  3:57   ` kernel test robot
2021-03-29 15:00 ` [PATCH 22/22] ARM: dts: aspeed: Add Rainier 1S4U machine Eddie James

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=20210329150020.13632-10-eajames@linux.ibm.com \
    --to=eajames@linux.ibm.com \
    --cc=alpankum@in.ibm.com \
    --cc=andrew@aj.id.au \
    --cc=devicetree@vger.kernel.org \
    --cc=joel@jms.id.au \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=robh+dt@kernel.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).