From patchwork Wed Apr 3 13:28:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13616202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F680CD128A for ; Wed, 3 Apr 2024 13:45:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id EFA36C433C7; Wed, 3 Apr 2024 13:45:41 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 812A0C43390 for ; Wed, 3 Apr 2024 13:45:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 812A0C43390 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id 6F46737948F for ; Wed, 3 Apr 2024 13:37:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TdyoVG6mlEMc for ; Wed, 3 Apr 2024 15:37:37 +0200 (CEST) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id 9705137945A; Wed, 3 Apr 2024 15:37:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1712151451; bh=FIkSUNs/sbSf4YGW1uMUy2MIHSMnoVsTHAqBue/Rj2c=; h=From:To:Subject:Date:In-Reply-To:References; b=VxnvNx3KCHNzIfzWa9MUtUbD8cvjAwRoqSRHFOmK5Xw6HO/ZVKMz90FJ7W9a8uWl9 ODCKkJfa64wt9RUCy5wNNOL0yN195qb1/Q2HCAGUsNOq56fap8ZuWjNNTRtmM19zoX 9XiWOwS7O/7ua21mCF3mOuCVlxAOsfkeXHeAx4j8= From: Renze Nicolai List-Id: To: renze@rnplus.nl, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au Subject: [PATCH v2 1/3] ARM: dts: Modify GPIO table for Asrock X570D4U BMC Date: Wed, 3 Apr 2024 15:28:51 +0200 Message-ID: <20240403133037.37782-2-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403133037.37782-1-renze@rnplus.nl> References: <20240403133037.37782-1-renze@rnplus.nl> MIME-Version: 1.0 Restructure GPIO table to fit maximum line length. Fix mistakes found while working on OpenBMC userland configuration and based on probing the board. Schematic for this board is not available. Because of this the choice was made to use a descriptive method for naming the GPIOs. - Push-pull outputs start with output-* - Open-drain outputs start with control-* - LED outputs start with led-* - Inputs start with input-* - Button inputs start with button-* - Active low signals end with *-n Signed-off-by: Renze Nicolai --- .../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 95 ++++++++----------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index 3c975bc41ae7..dff69d6ff146 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -79,64 +79,43 @@ iio-hwmon { &gpio { status = "okay"; gpio-line-names = - /*A0-A3*/ "status-locatorled-n", "", "button-nmi-n", "", - /*A4-A7*/ "", "", "", "", - /*B0-B3*/ "input-bios-post-cmplt-n", "", "", "", - /*B4-B7*/ "", "", "", "", - /*C0-C3*/ "", "", "", "", - /*C4-C7*/ "", "", "control-locatorbutton", "", - /*D0-D3*/ "button-power", "control-power", "button-reset", "control-reset", - /*D4-D7*/ "", "", "", "", - /*E0-E3*/ "", "", "", "", - /*E4-E7*/ "", "", "", "", - /*F0-F3*/ "", "", "", "", - /*F4-F7*/ "", "", "", "", - /*G0-G3*/ "output-rtc-battery-voltage-read-enable", "input-id0", "input-id1", "input-id2", - /*G4-G7*/ "input-alert1-n", "input-alert2-n", "input-alert3-n", "", - /*H0-H3*/ "", "", "", "", - /*H4-H7*/ "input-mfg", "", "led-heartbeat-n", "input-caseopen", - /*I0-I3*/ "", "", "", "", - /*I4-I7*/ "", "", "", "", - /*J0-J3*/ "output-bmc-ready", "", "", "", - /*J4-J7*/ "", "", "", "", - /*K0-K3*/ "", "", "", "", - /*K4-K7*/ "", "", "", "", - /*L0-L3*/ "", "", "", "", - /*L4-L7*/ "", "", "", "", - /*M0-M3*/ "", "", "", "", - /*M4-M7*/ "", "", "", "", - /*N0-N3*/ "", "", "", "", - /*N4-N7*/ "", "", "", "", - /*O0-O3*/ "", "", "", "", - /*O4-O7*/ "", "", "", "", - /*P0-P3*/ "", "", "", "", - /*P4-P7*/ "", "", "", "", - /*Q0-Q3*/ "", "", "", "", - /*Q4-Q7*/ "", "", "", "", - /*R0-R3*/ "", "", "", "", - /*R4-R7*/ "", "", "", "", - /*S0-S3*/ "input-bmc-pchhot-n", "", "", "", - /*S4-S7*/ "", "", "", "", - /*T0-T3*/ "", "", "", "", - /*T4-T7*/ "", "", "", "", - /*U0-U3*/ "", "", "", "", - /*U4-U7*/ "", "", "", "", - /*V0-V3*/ "", "", "", "", - /*V4-V7*/ "", "", "", "", - /*W0-W3*/ "", "", "", "", - /*W4-W7*/ "", "", "", "", - /*X0-X3*/ "", "", "", "", - /*X4-X7*/ "", "", "", "", - /*Y0-Y3*/ "", "", "", "", - /*Y4-Y7*/ "", "", "", "", - /*Z0-Z3*/ "", "", "led-fault-n", "output-bmc-throttle-n", - /*Z4-Z7*/ "", "", "", "", - /*AA0-AA3*/ "input-cpu1-thermtrip-latch-n", "", "input-cpu1-prochot-n", "", - /*AA4-AC7*/ "", "", "", "", - /*AB0-AB3*/ "", "", "", "", - /*AB4-AC7*/ "", "", "", "", - /*AC0-AC3*/ "", "", "", "", - /*AC4-AC7*/ "", "", "", ""; + /* A */ "input-locatorled-n", "", "", "", "", "", "", "", + /* B */ "input-bios-post-cmplt-n", "", "", "", "", "", "", "", + /* C */ "", "", "", "", "", "", "control-locatorbutton-n", "", + /* D */ "button-power-n", "control-power-n", "button-reset-n", + "control-reset-n", "", "", "", "", + /* E */ "", "", "", "", "", "", "", "", + /* F */ "", "", "", "", "", "", "", "", + /* G */ "output-hwm-vbat-enable", "input-id0-n", "input-id1-n", + "input-id2-n", "input-aux-smb-alert-n", "", + "input-psu-smb-alert-n", "", + /* H */ "", "", "", "", "input-mfg-mode-n", "", + "led-heartbeat-n", "input-case-open-n", + /* I */ "", "", "", "", "", "", "", "", + /* J */ "output-bmc-ready-n", "", "", "", "", "", "", "", + /* K */ "", "", "", "", "", "", "", "", + /* L */ "", "", "", "", "", "", "", "", + /* M */ "", "", "", "", "", "", "", "", + /* N */ "", "", "", "", "", "", "", "", + /* O */ "", "", "", "", "", "", "", "", + /* P */ "", "", "", "", "", "", "", "", + /* Q */ "", "", "", "", "input-bmc-smb-present-n", "", "", + "input-pcie-wake-n", + /* R */ "", "", "", "", "", "", "", "", + /* S */ "input-bmc-pchhot-n", "", "", "", "", "", "", "", + /* T */ "", "", "", "", "", "", "", "", + /* U */ "", "", "", "", "", "", "", "", + /* V */ "", "", "", "", "", "", "", "", + /* W */ "", "", "", "", "", "", "", "", + /* X */ "", "", "", "", "", "", "", "", + /* Y */ "input-sleep-s3-n", "input-sleep-s5-n", "", "", "", "", + "", "", + /* Z */ "", "", "led-fault-n", "output-bmc-throttle-n", "", "", + "", "", + /* AA */ "input-cpu1-thermtrip-latch-n", "", + "input-cpu1-prochot-n", "", "", "", "", "", + /* AB */ "", "input-power-good", "", "", "", "", "", "", + /* AC */ "", "", "", "", "", "", "", ""; }; &fmc { From patchwork Wed Apr 3 13:28:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13616201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7686BCD1288 for ; Wed, 3 Apr 2024 13:45:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 45C57C433F1; Wed, 3 Apr 2024 13:45:39 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 3755EC43390 for ; Wed, 3 Apr 2024 13:45:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 3755EC43390 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id C9E46379491 for ; Wed, 3 Apr 2024 13:37:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XWKYp-y20NDk for ; Wed, 3 Apr 2024 15:37:39 +0200 (CEST) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id CBDE337947A; Wed, 3 Apr 2024 15:37:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1712151453; bh=J3x6v1j8NItiPEP2ALslVPQ+eLcuXH6rDPyikVVJs7U=; h=From:To:Subject:Date:In-Reply-To:References; b=Z26dLVShrOqZaVWeKDgn4w32mfSkcvgNAkOzrO3X9xDzIkQIu66+cACZmAdvbrv86 kjr6bffH0ynPQYYIyKPNwQN3B+4GBGuok9EkXfnQORJWkEPYozDDcDaQh61F3YxYbG VMCxGa1Nm6fuT3UzR9LBOMwRqrUOitlAZI+IGJ1E= From: Renze Nicolai List-Id: To: renze@rnplus.nl, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au Subject: [PATCH v2 2/3] ARM: dts: Disable unused ADC channels for Asrock X570D4U BMC Date: Wed, 3 Apr 2024 15:28:52 +0200 Message-ID: <20240403133037.37782-3-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403133037.37782-1-renze@rnplus.nl> References: <20240403133037.37782-1-renze@rnplus.nl> MIME-Version: 1.0 Additionally adds labels describing the ADC channels. Signed-off-by: Renze Nicolai --- .../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index dff69d6ff146..66318ef8caae 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -337,20 +337,17 @@ fan@5 { &adc { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_adc0_default - &pinctrl_adc1_default - &pinctrl_adc2_default - &pinctrl_adc3_default - &pinctrl_adc4_default - &pinctrl_adc5_default - &pinctrl_adc6_default - &pinctrl_adc7_default - &pinctrl_adc8_default - &pinctrl_adc9_default - &pinctrl_adc10_default - &pinctrl_adc11_default - &pinctrl_adc12_default - &pinctrl_adc13_default - &pinctrl_adc14_default - &pinctrl_adc15_default>; + pinctrl-0 = <&pinctrl_adc0_default /* 3VSB */ + &pinctrl_adc1_default /* 5VSB */ + &pinctrl_adc2_default /* VCPU */ + &pinctrl_adc3_default /* VSOC */ + &pinctrl_adc4_default /* VCCM */ + &pinctrl_adc5_default /* APU-VDDP */ + &pinctrl_adc6_default /* PM-VDD-CLDO */ + &pinctrl_adc7_default /* PM-VDDCR-S5 */ + &pinctrl_adc8_default /* PM-VDDCR */ + &pinctrl_adc9_default /* VBAT */ + &pinctrl_adc10_default /* 3V */ + &pinctrl_adc11_default /* 5V */ + &pinctrl_adc12_default>; /* 12V */ }; From patchwork Wed Apr 3 13:28:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13616199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 61B89CD128A for ; Wed, 3 Apr 2024 13:45:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 3B49FC43394; Wed, 3 Apr 2024 13:45:39 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 86D16C433A6 for ; Wed, 3 Apr 2024 13:45:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 86D16C433A6 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id CE2AD37949D for ; Wed, 3 Apr 2024 13:37:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15jl2Ug6j5ti for ; Wed, 3 Apr 2024 15:37:40 +0200 (CEST) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id 2BC6437947E; Wed, 3 Apr 2024 15:37:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1712151454; bh=r1SkfVNj9bPZQxz4eJiuARml22W5WexeFCEA4WoTAhE=; h=From:To:Subject:Date:In-Reply-To:References; b=CosIn5k/pC1BTczzT1M+4joQcZbp4n7ILWW8+2LUwn+17UFB9/XFtruCrIC/knOkp cz6ov+aZUrGlc2TpXaN9CvqURx13tabctFSqaKWIDf/xwo5vlUI97XZTPBHqpZvVQs bmxf5CeBaVeJN8oXUrN8s/Cgm1tCmivWkrit1rJo= From: Renze Nicolai List-Id: To: renze@rnplus.nl, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au Subject: [PATCH v2 3/3] ARM: dts: Modify I2C bus configuration Date: Wed, 3 Apr 2024 15:28:53 +0200 Message-ID: <20240403133037.37782-4-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403133037.37782-1-renze@rnplus.nl> References: <20240403133037.37782-1-renze@rnplus.nl> MIME-Version: 1.0 Enable I2C bus 8 which is exposed on the IPMB_1 connector on the X570D4U mainboard. Additionally adds a descriptive comment to I2C busses 1 and 5. Signed-off-by: Renze Nicolai --- arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index 66318ef8caae..8dee4faa9e07 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -162,6 +162,7 @@ &i2c0 { }; &i2c1 { + /* Hardware monitoring SMBus */ status = "okay"; w83773g@4c { @@ -219,6 +220,7 @@ i2c4mux0ch3: i2c@3 { }; &i2c5 { + /* SMBus on BMC connector (BMC_SMB_1) */ status = "okay"; }; @@ -243,6 +245,11 @@ eth1_macaddress: macaddress@3f88 { }; }; +&i2c8 { + /* SMBus on intelligent platform management bus header (IPMB_1) */ + status = "okay"; +}; + &gfx { status = "okay"; };