From nobody Sun Nov 24 07:18:51 2024 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27E1D20F5D9; Thu, 7 Nov 2024 12:42:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730983345; cv=none; b=uDSUYbroEvhmI7547s6EaxWeEiRQBM0doLULspp7xMMPu3/Nqw0EV7ViuNIFYBsZusu+CCqnaQ2LWo59zKU1aDBAPUrCdrFZvicwGbFouJ+7vWMIVuCE7x3uE2IhmwW0OXYYYIcjjnk87iKFgWNATVGMg20o676hULzTNcMMgkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730983345; c=relaxed/simple; bh=1KzXfE/phY4WB98wge7x+4YWA7p6w9FVqaeKow5FPSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T9RsN+owOFG8Li9gMhcZVfrxYaR6Y7H/m7Mzlklq6/iSEtwnFfuf6q8CJiU2HQffrapEV0RCFJ7w4x9OgGTUOzK+ezl0tPnUELgsfXGDil+9bL4Iaf1ZWMH6cOtm9/VFy3/Jqmokb61I2LABw7Lg705J1wFn+pOyWKB/1OzA09I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kPHgrSrq; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kPHgrSrq" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-207115e3056so9212185ad.2; Thu, 07 Nov 2024 04:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730983343; x=1731588143; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kNEGN+X9jsQkgFs6oV9OB2bKgz2zTu7nBPwDRCmjXSM=; b=kPHgrSrqm2+buYtYd8s7+eTTa7BOwKmrS2CSALZSsKAnRvmQLQQYHB3YZ2g86gTN6c BOpgVhjyHms1h3/GFf8MofQY/d7WvE3SwjW8iepoGPZpguKiTxQjGnXX4HK7GPpliccG 7uP1jmJOdkZDhvkNMWu6yUf4J+bx8psJnVx5xb0f7Z3pUk8yIFNMU+lPxRrK/kAjOAuA g3WZD5tyMUuvAegzsh02qjb9e6drjwMB+i9dH8jHmxG7u+5Fpm4TJPpfSgVm0s16jzPx i9MBn/lsmKpa+0zbNTeMa4NANxUyRFrfIe/rkO5atLlhWaJqdGicZWpmLaQijd66gTC9 8jUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730983343; x=1731588143; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kNEGN+X9jsQkgFs6oV9OB2bKgz2zTu7nBPwDRCmjXSM=; b=oQftbVJMnFZgadYr8i3QlkEjR7X1mlv1mk9iD1kfIRtPiFZUnsy+sIbm+CQLSwkJQh oclxCrDrnZGsYJdDzt6lJn/qpiKg8ySl0QuGHd+XOui/oe8AvysGOpmkolfnDsMQ50xn o0b95IrXXV4HNOJFqRnUH0j8RdKrR4v3KixMHaio3CdPwKJamuO+G9A6hPJbklPCDDBN P96NHYmO927ZnrctM+YKu5saYo2lgSsiKXbABYb78Icev5AvAiS4DIzNmZYx80pBK3ef 7YA5WENMgCdehD3U5o8NbDU1qHJdno8ES+PhONqejl3iAooofHMnmIXdexqH0kqNZkoV B+Rg== X-Forwarded-Encrypted: i=1; AJvYcCUSOjsI0Op8KRYZnQLsfBvsY2nxqZvRRYi/0FOEx5ApW3+yvoQha+CLGwkNDmi1hIWFAN9M7QM06cJjuvU=@vger.kernel.org X-Gm-Message-State: AOJu0YzFSdiOsHcackyVMa3GL8Nw7PuREtM+qZsHoPIBW7ofn2tv8ccL +J3HN8tHpuRodL98f8N5WVuBaERqvvUzKyvLa+EisW9BPpt+OHtc X-Google-Smtp-Source: AGHT+IHw/mIi4fwHrLjEvutGISRpw2hBcjcLrIxv45YZ6jpB08x+XFdXcXJdJpfX20IYT1A5uLofKw== X-Received: by 2002:a17:902:f712:b0:20c:9821:6998 with SMTP id d9443c01a7336-210c6872732mr605679035ad.10.1730983343366; Thu, 07 Nov 2024 04:42:23 -0800 (PST) Received: from localhost.localdomain (61-220-246-151.hinet-ip.hinet.net. [61.220.246.151]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21177e412d8sm11101975ad.113.2024.11.07.04.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 04:42:23 -0800 (PST) From: Potin Lai Date: Thu, 07 Nov 2024 20:39:57 +0800 Subject: [PATCH v2 1/2] ARM: dts: aspeed: catalina: update pdb board cpld ioexp linename Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241107-catalina-cpld-ioexp-update-v2-1-d7742eabc0e6@gmail.com> References: <20241107-catalina-cpld-ioexp-update-v2-0-d7742eabc0e6@gmail.com> In-Reply-To: <20241107-catalina-cpld-ioexp-update-v2-0-d7742eabc0e6@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , Patrick Williams Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Potin Lai , Cosmo Chou , Potin Lai X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730983338; l=5178; i=potin.lai.pt@gmail.com; s=20240724; h=from:subject:message-id; bh=1KzXfE/phY4WB98wge7x+4YWA7p6w9FVqaeKow5FPSk=; b=NF2Z2IzMN510NJ9FefMB9c/twk4An6ui3Mq83g5ytYdN4WzcYsXz5D1tHkzQGQH4nG7H2tVKS BkJ8NKmke4PBLoCY8hubUHyq1XcrWFhs2T3JsdPHSGAkXsLMx+wEVj7 X-Developer-Key: i=potin.lai.pt@gmail.com; a=ed25519; pk=6Z4H4V4fJwLteH/WzIXSsx6TkuY5FOcBBP+4OflJ5gM= Due to there are huge changes of PDB CPLD IOEXP pin definitions since DVT version, Update the CPLD IOEXP nodes and GPIO linename of each PDB CPLD IO expander based on latest DVT CPLD firmware. Signed-off-by: Potin Lai --- .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 99 +++++++-----------= ---- 1 file changed, 29 insertions(+), 70 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/ar= ch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts index 82835e96317d..10a9fca1b803 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts @@ -802,26 +802,6 @@ io_expander12: gpio@13 { gpio-controller; #gpio-cells =3D <2>; }; - - // PDB CPLD IOEXP 0x14 - io_expander13: gpio@14 { - compatible =3D "nxp,pca9555"; - interrupt-parent =3D <&gpio0>; - interrupts =3D ; - reg =3D <0x14>; - gpio-controller; - #gpio-cells =3D <2>; - }; - - // PDB CPLD IOEXP 0x15 - io_expander14: gpio@15 { - compatible =3D "nxp,pca9555"; - interrupt-parent =3D <&gpio0>; - interrupts =3D ; - reg =3D <0x15>; - gpio-controller; - #gpio-cells =3D <2>; - }; }; =20 &i2c15 { @@ -1040,71 +1020,50 @@ &io_expander8 { =20 &io_expander9 { gpio-line-names =3D - "LEAK3_DETECT_R","LEAK1_DETECT_R", - "LEAK2_DETECT_R","LEAK0_DETECT_R", - "CHASSIS3_LEAK_Q_N_PLD","CHASSIS1_LEAK_Q_N_PLD", - "CHASSIS2_LEAK_Q_N_PLD","CHASSIS0_LEAK_Q_N_PLD", - "P12V_AUX_FAN_ALERT_PLD_N","P12V_AUX_FAN_OC_PLD_N", - "P12V_AUX_FAN_FAULT_PLD_N","LEAK_DETECT_RMC_N_R", - "RSVD_RMC_GPIO3_R","SMB_RJ45_FIO_TMP_ALERT", - "",""; + "wSequence_Latch_State_N","wP12V_N1N2_RUNTIME_FLT_N", + "wP12V_FAN_RUNTIME_FLT_N","wP12V_AUX_RUNTIME_FLT_N", + "wHost_PERST_SEQPWR_FLT_N","wP12V_N1N2_SEQPWR_FLT_N", + "wP12V_FAN_SEQPWR_FLT_N","wP12V_AUX_SEQPWR_FLT_N", + "wP12V_RUNTIME_FLT_NIC1_N","wAUX_RUNTIME_FLT_NIC1_N", + "wP12V_SEQPWR_FLT_NIC1_N","wAUX_SEQPWR_FLT_NIC1_N", + "wP12V_RUNTIME_FLT_NIC0_N","wAUX_RUNTIME_FLT_NIC0_N", + "wP12V_SEQPWR_FLT_NIC0_N","wAUX_SEQPWR_FLT_NIC0_N"; }; =20 &io_expander10 { gpio-line-names =3D "FM_P12V_NIC1_FLTB_R_N","FM_P3V3_NIC1_FAULT_R_N", - "OCP_V3_2_PWRBRK_FROM_HOST_ISO_PLD_N", - "P12V_AUX_NIC1_SENSE_ALERT_R_N", "FM_P12V_NIC0_FLTB_R_N","FM_P3V3_NIC0_FAULT_R_N", - "OCP_SFF_PWRBRK_FROM_HOST_ISO_PLD_N", - "P12V_AUX_NIC0_SENSE_ALERT_R_N", + "P48V_HS2_FAULT_N_PLD","P48V_HS1_FAULT_N_PLD", + "P12V_AUX_FAN_OC_PLD_N","P12V_AUX_FAN_FAULT_PLD_N", + "","", + "","", + "","FM_SYS_THROTTLE_N", + "OCP_V3_2_PWRBRK_FROM_HOST_ISO_PLD_N", + "OCP_SFF_PWRBRK_FROM_HOST_ISO_PLD_N"; +}; + +&io_expander11 { + gpio-line-names =3D "P12V_AUX_PSU_SMB_ALERT_R_L","P12V_SCM_SENSE_ALERT_R_N", + "P12V_AUX_NIC1_SENSE_ALERT_R_N","P12V_AUX_NIC0_SENSE_ALERT_R_N", "NODEB_PSU_SMB_ALERT_R_L","NODEA_PSU_SMB_ALERT_R_L", - "P52V_SENSE_ALERT_PLD_N","P48V_HS2_FAULT_N_PLD", - "P48V_HS1_FAULT_N_PLD",""; + "P12V_AUX_FAN_ALERT_PLD_N","P52V_SENSE_ALERT_PLD_N", + "PRSNT_RJ45_FIO_N_R","FM_MAIN_PWREN_RMC_EN_ISO_R", + "CHASSIS3_LEAK_Q_N_PLD","CHASSIS2_LEAK_Q_N_PLD", + "CHASSIS1_LEAK_Q_N_PLD","CHASSIS0_LEAK_Q_N_PLD", + "","SMB_RJ45_FIO_TMP_ALERT"; }; =20 -&io_expander11 { +&io_expander12 { gpio-line-names =3D "FAN_7_PRESENT_N","FAN_6_PRESENT_N", "FAN_5_PRESENT_N","FAN_4_PRESENT_N", "FAN_3_PRESENT_N","FAN_2_PRESENT_N", "FAN_1_PRESENT_N","FAN_0_PRESENT_N", - "PRSNT_CHASSIS3_LEAK_CABLE_R_N","PRSNT_CHASSIS1_LEAK_CABLE_R_N", - "PRSNT_CHASSIS2_LEAK_CABLE_R_N","PRSNT_CHASSIS0_LEAK_CABLE_R_N", - "PRSNT_RJ45_FIO_N_R","PRSNT_HDDBD_POWER_CABLE_N", - "PRSNT_OSFP_POWER_CABLE_N",""; -}; - -&io_expander12 { - gpio-line-names =3D - "RST_OCP_V3_1_R_N","NIC0_PERST_N", - "OCP_SFF_PERST_FROM_HOST_ISO_PLD_N","OCP_SFF_MAIN_PWR_EN", - "FM_OCP_SFF_PWR_GOOD_PLD","OCP_SFF_AUX_PWR_PLD_EN_R", - "HP_LVC3_OCP_V3_1_PWRGD_PLD","HP_OCP_V3_1_HSC_PWRGD_PLD_R", - "RST_OCP_V3_2_R_N","NIC1_PERST_N", - "OCP_V3_2_PERST_FROM_HOST_ISO_PLD_N","OCP_V3_2_MAIN_PWR_EN", - "FM_OCP_V3_2_PWR_GOOD_PLD","OCP_V3_2_AUX_PWR_PLD_EN_R", - "HP_LVC3_OCP_V3_2_PWRGD_PLD","HP_OCP_V3_2_HSC_PWRGD_PLD_R"; -}; - -&io_expander13 { - gpio-line-names =3D - "NODEA_NODEB_PWOK_PLD_ISO_R","PWR_EN_NICS", - "PWRGD_P12V_AUX_FAN_PLD","P12V_AUX_FAN_EN_PLD", - "PWRGD_P3V3_AUX_PLD","PWRGD_P12V_AUX_PLD_ISO_R", - "FM_MAIN_PWREN_FROM_RMC_R","FM_MAIN_PWREN_RMC_EN_ISO_R", - "PWRGD_RMC_R","PWRGD_P12V_AUX_FAN_PLD", - "P12V_AUX_FAN_EN_PLD","FM_SYS_THROTTLE_N", "HP_LVC3_OCP_V3_2_PRSNT2_PLD_N","HP_LVC3_OCP_V3_1_PRSNT2_PLD_N", - "",""; + "PRSNT_HDDBD_POWER_CABLE_N","PRSNT_OSFP0_POWER_CABLE_N", + "PRSNT_CHASSIS3_LEAK_CABLE_R_N","PRSNT_CHASSIS2_LEAK_CABLE_R_N", + "PRSNT_CHASSIS1_LEAK_CABLE_R_N","PRSNT_CHASSIS0_LEAK_CABLE_R_N"; }; =20 -&io_expander14 { - gpio-line-names =3D - "","","","","","","","", - "FM_BOARD_BMC_SKU_ID3","FM_BOARD_BMC_SKU_ID2", - "FM_BOARD_BMC_SKU_ID1","FM_BOARD_BMC_SKU_ID0", - "FAB_BMC_REV_ID2","FAB_BMC_REV_ID1", - "FAB_BMC_REV_ID0",""; -}; --=20 2.31.1